aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/packages.go
diff options
context:
space:
mode:
Diffstat (limited to 'rpc/packages.go')
-rw-r--r--rpc/packages.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/rpc/packages.go b/rpc/packages.go
index b51bde7ce..2f694b823 100644
--- a/rpc/packages.go
+++ b/rpc/packages.go
@@ -177,15 +177,11 @@ func (self *EthereumApi) AllLogs(args *FilterOptions, reply *interface{}) error
}
func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
- err := args.requirements()
- if err != nil {
- return err
- }
-
- if args.BlockNumber > 0 {
- *reply = p.xeth.BlockByNumber(args.BlockNumber)
- } else {
+ // This seems a bit precarious Maybe worth splitting to discrete functions
+ if len(args.Hash) > 0 {
*reply = p.xeth.BlockByHash(args.Hash)
+ } else {
+ *reply = p.xeth.BlockByNumber(args.BlockNumber)
}
return nil
}