interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update output types to use hexnum or hexdata 

Benefits from automatic output formatting differences between
quantities and data
This commit is contained in:
Taylor Gerring 2015-03-31 17:40:35 +02:00
parent 3a948b2dba
commit 81aeb78976
2 changed files with 112 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
rpc/responses.go
View File

@ -36,45 +36,45 @@ type BlockRes struct {
func (b *BlockRes) MarshalJSON() ([]byte, error) { func (b *BlockRes) MarshalJSON() ([]byte, error) {
var ext struct { var ext struct {
BlockNumber string `json:"number"` BlockNumber *hexnum `json:"number"`
BlockHash string `json:"hash"` BlockHash *hexdata `json:"hash"`
ParentHash string `json:"parentHash"` ParentHash *hexdata `json:"parentHash"`
Nonce string `json:"nonce"` Nonce *hexnum `json:"nonce"`
Sha3Uncles string `json:"sha3Uncles"` Sha3Uncles *hexdata `json:"sha3Uncles"`
LogsBloom string `json:"logsBloom"` LogsBloom *hexdata `json:"logsBloom"`
TransactionRoot string `json:"transactionRoot"` TransactionRoot *hexdata `json:"transactionRoot"`
StateRoot string `json:"stateRoot"` StateRoot *hexdata `json:"stateRoot"`
Miner string `json:"miner"` Miner *hexdata `json:"miner"`
Difficulty string `json:"difficulty"` Difficulty *hexnum `json:"difficulty"`
TotalDifficulty string `json:"totalDifficulty"` TotalDifficulty *hexnum `json:"totalDifficulty"`
Size string `json:"size"` Size *hexnum `json:"size"`
ExtraData string `json:"extraData"` ExtraData *hexdata `json:"extraData"`
GasLimit string `json:"gasLimit"` GasLimit *hexnum `json:"gasLimit"`
MinGasPrice string `json:"minGasPrice"` MinGasPrice *hexnum `json:"minGasPrice"`
GasUsed string `json:"gasUsed"` GasUsed *hexnum `json:"gasUsed"`
UnixTimestamp string `json:"timestamp"` UnixTimestamp *hexnum `json:"timestamp"`
Transactions []interface{} `json:"transactions"` Transactions []interface{} `json:"transactions"`
Uncles []string `json:"uncles"` Uncles []*hexdata `json:"uncles"`
} }
// convert strict types to hexified strings // convert strict types to hexified strings
ext.BlockNumber = common.ToHex(b.BlockNumber.Bytes()) ext.BlockNumber = newHexNum(b.BlockNumber.Bytes())
ext.BlockHash = b.BlockHash.Hex() ext.BlockHash = newHexData(b.BlockHash.Bytes())
ext.ParentHash = b.ParentHash.Hex() ext.ParentHash = newHexData(b.ParentHash.Bytes())
ext.Nonce = common.ToHex(b.Nonce[:]) ext.Nonce = newHexNum(b.Nonce[:])
ext.Sha3Uncles = b.Sha3Uncles.Hex() ext.Sha3Uncles = newHexData(b.Sha3Uncles.Bytes())
ext.LogsBloom = common.ToHex(b.LogsBloom[:]) ext.LogsBloom = newHexData(b.LogsBloom.Bytes())
ext.TransactionRoot = b.TransactionRoot.Hex() ext.TransactionRoot = newHexData(b.TransactionRoot.Bytes())
ext.StateRoot = b.StateRoot.Hex() ext.StateRoot = newHexData(b.StateRoot.Bytes())
ext.Miner = b.Miner.Hex() ext.Miner = newHexData(b.Miner.Bytes())
ext.Difficulty = common.ToHex(b.Difficulty.Bytes()) ext.Difficulty = newHexNum(b.Difficulty.Bytes())
ext.TotalDifficulty = common.ToHex(b.TotalDifficulty.Bytes()) ext.TotalDifficulty = newHexNum(b.TotalDifficulty.Bytes())
ext.Size = common.ToHex(b.Size.Bytes()) ext.Size = newHexNum(b.Size.Bytes())
ext.ExtraData = common.ToHex(b.ExtraData) ext.ExtraData = newHexData(b.ExtraData)
ext.GasLimit = common.ToHex(b.GasLimit.Bytes()) ext.GasLimit = newHexNum(b.GasLimit.Bytes())
// ext.MinGasPrice = common.ToHex(big.NewInt(b.MinGasPrice).Bytes()) // ext.MinGasPrice = newHexNum(big.NewInt(b.MinGasPrice).Bytes())
ext.GasUsed = common.ToHex(b.GasUsed.Bytes()) ext.GasUsed = newHexNum(b.GasUsed.Bytes())
ext.UnixTimestamp = common.ToHex(big.NewInt(b.UnixTimestamp).Bytes()) ext.UnixTimestamp = newHexNum(big.NewInt(b.UnixTimestamp).Bytes())
ext.Transactions = make([]interface{}, len(b.Transactions)) ext.Transactions = make([]interface{}, len(b.Transactions))
if b.fullTx { if b.fullTx {
for i, tx := range b.Transactions { for i, tx := range b.Transactions {
@ -82,12 +82,12 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
} }
} else { } else {
for i, tx := range b.Transactions { for i, tx := range b.Transactions {
ext.Transactions[i] = tx.Hash.Hex() ext.Transactions[i] = newHexData(tx.Hash.Bytes())
} }
} }
ext.Uncles = make([]string, len(b.Uncles)) ext.Uncles = make([]*hexdata, len(b.Uncles))
for i, v := range b.Uncles { for i, v := range b.Uncles {
ext.Uncles[i] = v.Hex() ext.Uncles[i] = newHexData(v.Bytes())
} }
return json.Marshal(ext) return json.Marshal(ext)
@ -134,9 +134,9 @@ func NewBlockRes(block *types.Block) *BlockRes {
type TransactionRes struct { type TransactionRes struct {
Hash common.Hash `json:"hash"` Hash common.Hash `json:"hash"`
Nonce uint64 `json:"nonce"` Nonce uint64 `json:"nonce"`
BlockHash common.Hash `json:"blockHash,omitempty"` BlockHash common.Hash `json:"blockHash"`
BlockNumber int64 `json:"blockNumber,omitempty"` BlockNumber int64 `json:"blockNumber"`
TxIndex int64 `json:"transactionIndex,omitempty"` TxIndex int64 `json:"transactionIndex"`
From common.Address `json:"from"` From common.Address `json:"from"`
To *common.Address `json:"to"` To *common.Address `json:"to"`
Value *big.Int `json:"value"` Value *big.Int `json:"value"`
@ -147,34 +147,30 @@ type TransactionRes struct {
func (t *TransactionRes) MarshalJSON() ([]byte, error) { func (t *TransactionRes) MarshalJSON() ([]byte, error) {
var ext struct { var ext struct {
Hash string `json:"hash"` Hash *hexdata `json:"hash"`
Nonce string `json:"nonce"` Nonce *hexnum `json:"nonce"`
BlockHash string `json:"blockHash,omitempty"` BlockHash *hexdata `json:"blockHash"`
BlockNumber string `json:"blockNumber,omitempty"` BlockNumber *hexnum `json:"blockNumber"`
TxIndex string `json:"transactionIndex,omitempty"` TxIndex *hexnum `json:"transactionIndex"`
From string `json:"from"` From *hexdata `json:"from"`
To interface{} `json:"to"` To *hexdata `json:"to"`
Value string `json:"value"` Value *hexnum `json:"value"`
Gas string `json:"gas"` Gas *hexnum `json:"gas"`
GasPrice string `json:"gasPrice"` GasPrice *hexnum `json:"gasPrice"`
Input string `json:"input"` Input *hexdata `json:"input"`
} }
ext.Hash = t.Hash.Hex() ext.Hash = newHexData(t.Hash.Bytes())
ext.Nonce = common.ToHex(big.NewInt(int64(t.Nonce)).Bytes()) ext.Nonce = newHexNum(big.NewInt(int64(t.Nonce)).Bytes())
ext.BlockHash = t.BlockHash.Hex() ext.BlockHash = newHexData(t.BlockHash.Bytes())
ext.BlockNumber = common.ToHex(big.NewInt(t.BlockNumber).Bytes()) ext.BlockNumber = newHexNum(big.NewInt(t.BlockNumber).Bytes())
ext.TxIndex = common.ToHex(big.NewInt(t.TxIndex).Bytes()) ext.TxIndex = newHexNum(big.NewInt(t.TxIndex).Bytes())
ext.From = t.From.Hex() ext.From = newHexData(t.From.Bytes())
if t.To == nil { ext.To = newHexData(t.To.Bytes())
ext.To = nil ext.Value = newHexNum(t.Value.Bytes())
} else { ext.Gas = newHexNum(t.Gas.Bytes())
ext.To = t.To.Hex() ext.GasPrice = newHexNum(t.GasPrice.Bytes())
} ext.Input = newHexData(t.Input)
ext.Value = common.ToHex(t.Value.Bytes())
ext.Gas = common.ToHex(t.Gas.Bytes())
ext.GasPrice = common.ToHex(t.GasPrice.Bytes())
ext.Input = common.ToHex(t.Input)
return json.Marshal(ext) return json.Marshal(ext)
} }
@ -192,34 +188,39 @@ func NewTransactionRes(tx *types.Transaction) *TransactionRes {
return v return v
} }
type FilterLogRes struct { // type FilterLogRes struct {
Hash string `json:"hash"` // Hash string `json:"hash"`
Address string `json:"address"` // Address string `json:"address"`
Data string `json:"data"` // Data string `json:"data"`
BlockNumber string `json:"blockNumber"` // BlockNumber string `json:"blockNumber"`
TransactionHash string `json:"transactionHash"` // TransactionHash string `json:"transactionHash"`
BlockHash string `json:"blockHash"` // BlockHash string `json:"blockHash"`
TransactionIndex string `json:"transactionIndex"` // TransactionIndex string `json:"transactionIndex"`
LogIndex string `json:"logIndex"` // LogIndex string `json:"logIndex"`
} // }
type FilterWhisperRes struct { // type FilterWhisperRes struct {
Hash string `json:"hash"` // Hash string `json:"hash"`
From string `json:"from"` // From string `json:"from"`
To string `json:"to"` // To string `json:"to"`
Expiry string `json:"expiry"` // Expiry string `json:"expiry"`
Sent string `json:"sent"` // Sent string `json:"sent"`
Ttl string `json:"ttl"` // Ttl string `json:"ttl"`
Topics string `json:"topics"` // Topics string `json:"topics"`
Payload string `json:"payload"` // Payload string `json:"payload"`
WorkProved string `json:"workProved"` // WorkProved string `json:"workProved"`
} // }
type LogRes struct { type LogRes struct {
Address common.Address `json:"address"` Address common.Address `json:"address"`
Topics []common.Hash `json:"topics"` Topics []common.Hash `json:"topics"`
Data []byte `json:"data"` Data []byte `json:"data"`
Number uint64 `json:"number"` BlockNumber uint64 `json:"blockNumber"`
Hash common.Hash `json:"hash"`
LogIndex uint64 `json:"logIndex"`
BlockHash common.Hash `json:"blockHash"`
TransactionHash common.Hash `json:"transactionHash"`
TransactionIndex uint64 `json:"transactionIndex"`
} }
func NewLogRes(log state.Log) LogRes { func NewLogRes(log state.Log) LogRes {
@ -227,7 +228,7 @@ func NewLogRes(log state.Log) LogRes {
l.Topics = make([]common.Hash, len(log.Topics())) l.Topics = make([]common.Hash, len(log.Topics()))
l.Address = log.Address() l.Address = log.Address()
l.Data = log.Data() l.Data = log.Data()
l.Number = log.Number() l.BlockNumber = log.Number()
for j, topic := range log.Topics() { for j, topic := range log.Topics() {
l.Topics[j] = topic l.Topics[j] = topic
} }
@ -236,18 +237,23 @@ func NewLogRes(log state.Log) LogRes {
func (l *LogRes) MarshalJSON() ([]byte, error) { func (l *LogRes) MarshalJSON() ([]byte, error) {
var ext struct { var ext struct {
Address string `json:"address"` Address *hexdata `json:"address"`
Topics []string `json:"topics"` Topics []*hexdata `json:"topics"`
Data string `json:"data"` Data *hexdata `json:"data"`
Number string `json:"number"` BlockNumber *hexnum `json:"blockNumber"`
Hash *hexdata `json:"hash"`
LogIndex *hexnum `json:"logIndex"`
BlockHash *hexdata `json:"blockHash"`
TransactionHash *hexdata `json:"transactionHash"`
TransactionIndex *hexnum `json:"transactionIndex"`
} }
ext.Address = l.Address.Hex() ext.Address = newHexData(l.Address.Bytes())
ext.Data = common.ToHex(l.Data) ext.Data = newHexData(l.Data)
ext.Number = common.ToHex(big.NewInt(int64(l.Number)).Bytes()) ext.BlockNumber = newHexNum(l.BlockNumber)
ext.Topics = make([]string, len(l.Topics)) ext.Topics = make([]*hexdata, len(l.Topics))
for i, v := range l.Topics { for i, v := range l.Topics {
ext.Topics[i] = v.Hex() ext.Topics[i] = newHexData(v)
} }
return json.Marshal(ext) return json.Marshal(ext)

8
rpc/responses_test.go
View File

@ -88,10 +88,10 @@ func TestLogRes(t *testing.T) {
topics = append(topics, common.HexToHash("0x20")) topics = append(topics, common.HexToHash("0x20"))
v := &LogRes{ v := &LogRes{
Topics: topics, Topics: topics,
Address: common.HexToAddress("0x0"), Address: common.HexToAddress("0x0"),
Data: []byte{1, 2, 3}, Data: []byte{1, 2, 3},
Number: uint64(5), BlockNumber: uint64(5),
} }
_, _ = json.Marshal(v) _, _ = json.Marshal(v)