diff options
| -rw-r--r-- | rpc/api.go | 18 | ||||
| -rw-r--r-- | rpc/args.go | 12 | ||||
| -rw-r--r-- | rpc/args_test.go | 12 |
3 files changed, 21 insertions, 21 deletions
diff --git a/rpc/api.go b/rpc/api.go index 8e3d3cc63..06014c74f 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -46,6 +46,13 @@ func NewEthereumApi(eth *xeth.XEth, dataDir string) *EthereumApi { return api } +func (self *EthereumApi) xeth() *xeth.XEth { + self.xethMu.RLock() + defer self.xethMu.RUnlock() + + return self.eth +} + func (self *EthereumApi) xethWithStateNum(num int64) *xeth.XEth { chain := self.xeth().Backend().ChainManager() var block *types.Block @@ -328,7 +335,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error return err } - v, err := p.GetBlockByHash(args.BlockHash, args.Transactions) + v, err := p.GetBlockByHash(args.BlockHash, args.IncludeTxs) if err != nil { return err } @@ -339,7 +346,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error return err } - v, err := p.GetBlockByNumber(args.BlockNumber, args.Transactions) + v, err := p.GetBlockByNumber(args.BlockNumber, args.IncludeTxs) if err != nil { return err } @@ -580,13 +587,6 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error return nil } -func (self *EthereumApi) xeth() *xeth.XEth { - self.xethMu.RLock() - defer self.xethMu.RUnlock() - - return self.eth -} - func toFilterOptions(options *FilterOptions) *core.FilterOptions { var opts core.FilterOptions diff --git a/rpc/args.go b/rpc/args.go index bd6be5a0f..cbb199902 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -35,8 +35,8 @@ func blockAge(raw interface{}, number *int64) (err error) { } type GetBlockByHashArgs struct { - BlockHash string - Transactions bool + BlockHash string + IncludeTxs bool } func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) { @@ -57,15 +57,15 @@ func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) { args.BlockHash = argstr if len(obj) > 1 { - args.Transactions = obj[1].(bool) + args.IncludeTxs = obj[1].(bool) } return nil } type GetBlockByNumberArgs struct { - BlockNumber int64 - Transactions bool + BlockNumber int64 + IncludeTxs bool } func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) { @@ -86,7 +86,7 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) { } if len(obj) > 1 { - args.Transactions = obj[1].(bool) + args.IncludeTxs = obj[1].(bool) } return nil diff --git a/rpc/args_test.go b/rpc/args_test.go index 0d8dc4085..f1ad6e8ed 100644 --- a/rpc/args_test.go +++ b/rpc/args_test.go @@ -82,7 +82,7 @@ func TestGetBlockByHashArgs(t *testing.T) { input := `["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331", true]` expected := new(GetBlockByHashArgs) expected.BlockHash = "0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331" - expected.Transactions = true + expected.IncludeTxs = true args := new(GetBlockByHashArgs) if err := json.Unmarshal([]byte(input), &args); err != nil { @@ -93,8 +93,8 @@ func TestGetBlockByHashArgs(t *testing.T) { t.Errorf("BlockHash should be %v but is %v", expected.BlockHash, args.BlockHash) } - if args.Transactions != expected.Transactions { - t.Errorf("Transactions should be %v but is %v", expected.Transactions, args.Transactions) + if args.IncludeTxs != expected.IncludeTxs { + t.Errorf("IncludeTxs should be %v but is %v", expected.IncludeTxs, args.IncludeTxs) } } @@ -112,7 +112,7 @@ func TestGetBlockByNumberArgs(t *testing.T) { input := `["0x1b4", false]` expected := new(GetBlockByNumberArgs) expected.BlockNumber = 436 - expected.Transactions = false + expected.IncludeTxs = false args := new(GetBlockByNumberArgs) if err := json.Unmarshal([]byte(input), &args); err != nil { @@ -123,8 +123,8 @@ func TestGetBlockByNumberArgs(t *testing.T) { t.Errorf("BlockHash should be %v but is %v", expected.BlockNumber, args.BlockNumber) } - if args.Transactions != expected.Transactions { - t.Errorf("Transactions should be %v but is %v", expected.Transactions, args.Transactions) + if args.IncludeTxs != expected.IncludeTxs { + t.Errorf("IncludeTxs should be %v but is %v", expected.IncludeTxs, args.IncludeTxs) } } |