Merge pull request #3088 from bas-vk/rpc-block-output

core/types: renamed receiptRoot to receiptsRoot

Merge pull request #3088 from bas-vk/rpc-block-output
core/types: renamed receiptRoot to receiptsRoot
c88e4357 · Felix Lange · GitHub · eeb2a1a6 · 71e8ae01 · c88e4357
Commit c88e4357 authored Oct 06, 2016 by Felix Lange Committed by GitHub Oct 06, 2016
Expand all Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

block.go core/types/block.go +1 -1

json_test.go core/types/json_test.go +4 -4

api.go internal/ethapi/api.go +1 -1

No files found.
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -104,7 +104,7 @@ type jsonHeader struct {
 	Coinbase    *common.Address `json:"miner"`
 	Root        *common.Hash    `json:"stateRoot"`
 	TxHash      *common.Hash    `json:"transactionsRoot"`
-	ReceiptHash *common.Hash    `json:"receiptRoot"`
+	ReceiptHash *common.Hash    `json:"receiptsRoot"`
 	Bloom       *Bloom          `json:"logsBloom"`
 	Difficulty  *hexBig         `json:"difficulty"`
 	Number      *hexBig         `json:"number"`

--- a/core/types/json_test.go
+++ b/core/types/json_test.go
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -597,7 +597,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
 		"gasUsed":          rpc.NewHexNumber(head.GasUsed),
 		"timestamp":        rpc.NewHexNumber(head.Time),
 		"transactionsRoot": head.TxHash,
-		"receiptRoot":      head.ReceiptHash,
+		"receiptsRoot":      head.ReceiptHash,
 	}
 	if inclTx {