diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-13 05:31:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-13 05:31:13 +0800 |
| commit | fa917387e4312981e7d9151c393b6c370e95ffbe (patch) | |
| tree | 278168194918c9dd2f9dd2d65b0a5227546b62ac | |
| parent | 310ca62285d2d4aefed91efddefeac7e83b7671d (diff) | |
| parent | 14bdcd2c052214ca78c7cb163771c780e2fd1291 (diff) | |
| download | go-tangerine-fa917387e4312981e7d9151c393b6c370e95ffbe.tar.gz go-tangerine-fa917387e4312981e7d9151c393b6c370e95ffbe.tar.zst go-tangerine-fa917387e4312981e7d9151c393b6c370e95ffbe.zip | |
Merge branch 'rpcfrontier' into develop
| -rw-r--r-- | cmd/mist/ui_lib.go | 3 | ||||
| -rw-r--r-- | rpc/args_test.go | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 2679e0f95..cc213b49a 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -149,7 +149,8 @@ func (self *UiLib) Compile(code string) (string, error) { func (self *UiLib) Call(params map[string]interface{}) (string, error) { object := mapToTxParams(params) - return self.XEth.Execute( + return self.XEth.Call( + object["from"], object["to"], object["value"], object["gas"], diff --git a/rpc/args_test.go b/rpc/args_test.go index 6b6d3c3c0..47d79cc32 100644 --- a/rpc/args_test.go +++ b/rpc/args_test.go @@ -477,7 +477,7 @@ func TestBlockNumIndexArgs(t *testing.T) { func TestHashIndexArgs(t *testing.T) { input := `["0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b", "0x1"]` expected := new(HashIndexArgs) - expected.BlockHash = "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b" + expected.Hash = "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b" expected.Index = 1 args := new(HashIndexArgs) @@ -485,8 +485,8 @@ func TestHashIndexArgs(t *testing.T) { t.Error(err) } - if expected.BlockHash != args.BlockHash { - t.Errorf("BlockHash shoud be %#v but is %#v", expected.BlockHash, args.BlockHash) + if expected.Hash != args.Hash { + t.Errorf("Hash shoud be %#v but is %#v", expected.Hash, args.Hash) } if expected.Index != args.Index { |