Bläddra i källkod

Use bytes.Repeat() instead of 32-byte literal

Taylor Gerring 10 år sedan
förälder
incheckning
748263d2f0
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      rpc/api.go

+ 2 - 1
rpc/api.go

@@ -230,6 +230,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 
 		block := api.xeth().EthBlockByNumber(args.BlockNumber)
 		br := NewBlockRes(block, args.IncludeTxs)
+		// If request was for "pending", nil nonsensical fields
 		if args.BlockNumber == -2 {
 			br.BlockHash = nil
 			br.BlockNumber = nil
@@ -247,7 +248,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		if tx != nil {
 			v := NewTransactionRes(tx)
 			// if the blockhash is 0, assume this is a pending transaction
-			if bytes.Compare(bhash.Bytes(), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}) != 0 {
+			if bytes.Compare(bhash.Bytes(), bytes.Repeat([]byte{0}, 32)) != 0 {
 				v.BlockHash = newHexData(bhash)
 				v.BlockNumber = newHexNum(bnum)
 				v.TxIndex = newHexNum(txi)