poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'rpcfrontier' into develop

This commit is contained in:
obscuren 2015-03-12 22:31:13 +01:00
parent 310ca62285 14bdcd2c05
commit fa917387e4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/mist/ui_lib.go
View File

@ -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"],

6
rpc/args_test.go
View File

@ -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 {