aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-04-02 18:30:22 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-04-02 18:30:22 +0800
commitf89baa73e5cfc0e93f32e36f5c3838cd808e6f46 (patch)
treea1a7108cb78be678a3dad4a2724ccc18482901d9
parent85ebbc9aa5e4c8902b94847dbeb78f26255eb0aa (diff)
downloaddexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar.gz
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar.bz2
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar.lz
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar.xz
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.tar.zst
dexon-f89baa73e5cfc0e93f32e36f5c3838cd808e6f46.zip
transactionRoot -> transactionsRoot
-rw-r--r--rpc/responses.go6
-rw-r--r--rpc/responses_test.go56
2 files changed, 31 insertions, 31 deletions
diff --git a/rpc/responses.go b/rpc/responses.go
index bf4f518aa..f1dc344db 100644
--- a/rpc/responses.go
+++ b/rpc/responses.go
@@ -16,7 +16,7 @@ type BlockRes struct {
Nonce *hexdata `json:"nonce"`
Sha3Uncles *hexdata `json:"sha3Uncles"`
LogsBloom *hexdata `json:"logsBloom"`
- TransactionRoot *hexdata `json:"transactionRoot"`
+ TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"`
Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"`
@@ -40,7 +40,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
Nonce *hexdata `json:"nonce"`
Sha3Uncles *hexdata `json:"sha3Uncles"`
LogsBloom *hexdata `json:"logsBloom"`
- TransactionRoot *hexdata `json:"transactionRoot"`
+ TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"`
Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"`
@@ -83,7 +83,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
Nonce *hexdata `json:"nonce"`
Sha3Uncles *hexdata `json:"sha3Uncles"`
LogsBloom *hexdata `json:"logsBloom"`
- TransactionRoot *hexdata `json:"transactionRoot"`
+ TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"`
Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"`
diff --git a/rpc/responses_test.go b/rpc/responses_test.go
index 0f911c886..2ec6d9d15 100644
--- a/rpc/responses_test.go
+++ b/rpc/responses_test.go
@@ -34,20 +34,20 @@ func TestNewBlockRes(t *testing.T) {
extra := ""
block := types.NewBlock(parentHash, coinbase, root, difficulty, nonce, extra)
tests := map[string]string{
- "number": reNum,
- "hash": reHash,
- "parentHash": reHash,
- "nonce": reData,
- "sha3Uncles": reHash,
- "logsBloom": reData,
- "transactionRoot": reHash,
- "stateRoot": reHash,
- "miner": reAddress,
- "difficulty": `"0x1"`,
- "totalDifficulty": reNum,
- "size": reNumNonZero,
- "extraData": reData,
- "gasLimit": reNum,
+ "number": reNum,
+ "hash": reHash,
+ "parentHash": reHash,
+ "nonce": reData,
+ "sha3Uncles": reHash,
+ "logsBloom": reData,
+ "transactionsRoot": reHash,
+ "stateRoot": reHash,
+ "miner": reAddress,
+ "difficulty": `"0x1"`,
+ "totalDifficulty": reNum,
+ "size": reNumNonZero,
+ "extraData": reData,
+ "gasLimit": reNum,
// "minGasPrice": "0x",
"gasUsed": reNum,
"timestamp": reNum,
@@ -84,20 +84,20 @@ func TestNewBlockResWithTrans(t *testing.T) {
extra := ""
block := types.NewBlock(parentHash, coinbase, root, difficulty, nonce, extra)
tests := map[string]string{
- "number": reNum,
- "hash": reHash,
- "parentHash": reHash,
- "nonce": reData,
- "sha3Uncles": reHash,
- "logsBloom": reData,
- "transactionRoot": reHash,
- "stateRoot": reHash,
- "miner": reAddress,
- "difficulty": `"0x1"`,
- "totalDifficulty": reNum,
- "size": reNumNonZero,
- "extraData": reData,
- "gasLimit": reNum,
+ "number": reNum,
+ "hash": reHash,
+ "parentHash": reHash,
+ "nonce": reData,
+ "sha3Uncles": reHash,
+ "logsBloom": reData,
+ "transactionsRoot": reHash,
+ "stateRoot": reHash,
+ "miner": reAddress,
+ "difficulty": `"0x1"`,
+ "totalDifficulty": reNum,
+ "size": reNumNonZero,
+ "extraData": reData,
+ "gasLimit": reNum,
// "minGasPrice": "0x",
"gasUsed": reNum,
"timestamp": reNum,