aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-23 18:54:23 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-23 18:54:23 +0800
commit6fd894aae00c8c0f9f33eae7353dd9afd97f4fa1 (patch)
treed63243bec273cf08743092d40023e0a87955892d /rpc
parentdd086791acf477da7641c168f82de70ed0b2dca6 (diff)
downloadgo-tangerine-6fd894aae00c8c0f9f33eae7353dd9afd97f4fa1.tar.gz
go-tangerine-6fd894aae00c8c0f9f33eae7353dd9afd97f4fa1.tar.zst
go-tangerine-6fd894aae00c8c0f9f33eae7353dd9afd97f4fa1.zip
Allow zero and negative block numbers
0 is genesis block. Xeth recognises -1 as current
Diffstat (limited to 'rpc')
-rw-r--r--rpc/args.go7
-rw-r--r--rpc/packages.go12
2 files changed, 4 insertions, 15 deletions
diff --git a/rpc/args.go b/rpc/args.go
index f730819fd..347f60410 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -22,13 +22,6 @@ func (obj *GetBlockArgs) UnmarshalJSON(b []byte) (err error) {
return NewErrorResponse(ErrorDecodeArgs)
}
-func (obj *GetBlockArgs) requirements() error {
- if obj.BlockNumber == 0 && obj.Hash == "" {
- return NewErrorResponse("GetBlock requires either a block 'number' or a block 'hash' as argument")
- }
- return nil
-}
-
type NewTxArgs struct {
From string `json:"from"`
To string `json:"to"`
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
}