forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

internal: address the comment

Browse source
This commit is contained in:
rjl493456442 2019-06-06 10:37:55 +08:00 committed by Péter Szilágyi
parent 726e4607f8
commit 647e1acb91
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/ethapi/api.go
View file

@ -624,7 +624,7 @@ func (s *PublicBlockChainAPI) GetHeaderByNumber(ctx context.Context, blockNr rpc
if header != nil && err == nil { if header != nil && err == nil {
response := rpcMarshalHeader(header) response := rpcMarshalHeader(header)
if blockNr == rpc.PendingBlockNumber { if blockNr == rpc.PendingBlockNumber {
// Pending blocks need to nil out a few fields // Pending header need to nil out a few fields
for _, field := range []string{"hash", "nonce", "miner"} { for _, field := range []string{"hash", "nonce", "miner"} {
response[field] = nil response[field] = nil
} }
@ -989,6 +989,7 @@ func rpcMarshalHeader(head *types.Header) map[string]interface{} {
// transaction hashes. // transaction hashes.
func RPCMarshalBlock(b *types.Block, inclTx bool, fullTx bool) (map[string]interface{}, error) { func RPCMarshalBlock(b *types.Block, inclTx bool, fullTx bool) (map[string]interface{}, error) {
fields := rpcMarshalHeader(b.Header()) fields := rpcMarshalHeader(b.Header())
fields["size"] = b.Size()
if inclTx { if inclTx {
formatTx := func(tx *types.Transaction) (interface{}, error) { formatTx := func(tx *types.Transaction) (interface{}, error) {