tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #763 from aboreum/develop

Browse Source 
Remove "minGasPrice" field from JSON responses. Closes. #754
This commit is contained in:
Jeffrey Wilcke 2015-04-21 02:30:40 -07:00
commit 8fce55b4c2
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/responses.go
View File

@ -24,7 +24,6 @@ type BlockRes struct {
Size *hexnum `json:"size"` Size *hexnum `json:"size"`
ExtraData *hexdata `json:"extraData"` ExtraData *hexdata `json:"extraData"`
GasLimit *hexnum `json:"gasLimit"` GasLimit *hexnum `json:"gasLimit"`
MinGasPrice *hexnum `json:"minGasPrice"`
GasUsed *hexnum `json:"gasUsed"` GasUsed *hexnum `json:"gasUsed"`
UnixTimestamp *hexnum `json:"timestamp"` UnixTimestamp *hexnum `json:"timestamp"`
Transactions []*TransactionRes `json:"transactions"` Transactions []*TransactionRes `json:"transactions"`
@ -48,7 +47,6 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
Size *hexnum `json:"size"` Size *hexnum `json:"size"`
ExtraData *hexdata `json:"extraData"` ExtraData *hexdata `json:"extraData"`
GasLimit *hexnum `json:"gasLimit"` GasLimit *hexnum `json:"gasLimit"`
MinGasPrice *hexnum `json:"minGasPrice"`
GasUsed *hexnum `json:"gasUsed"` GasUsed *hexnum `json:"gasUsed"`
UnixTimestamp *hexnum `json:"timestamp"` UnixTimestamp *hexnum `json:"timestamp"`
Transactions []*TransactionRes `json:"transactions"` Transactions []*TransactionRes `json:"transactions"`
@ -69,7 +67,6 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
ext.Size = b.Size ext.Size = b.Size
ext.ExtraData = b.ExtraData ext.ExtraData = b.ExtraData
ext.GasLimit = b.GasLimit ext.GasLimit = b.GasLimit
ext.MinGasPrice = b.MinGasPrice
ext.GasUsed = b.GasUsed ext.GasUsed = b.GasUsed
ext.UnixTimestamp = b.UnixTimestamp ext.UnixTimestamp = b.UnixTimestamp
ext.Transactions = b.Transactions ext.Transactions = b.Transactions
@ -94,7 +91,6 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
Size *hexnum `json:"size"` Size *hexnum `json:"size"`
ExtraData *hexdata `json:"extraData"` ExtraData *hexdata `json:"extraData"`
GasLimit *hexnum `json:"gasLimit"` GasLimit *hexnum `json:"gasLimit"`
MinGasPrice *hexnum `json:"minGasPrice"`
GasUsed *hexnum `json:"gasUsed"` GasUsed *hexnum `json:"gasUsed"`
UnixTimestamp *hexnum `json:"timestamp"` UnixTimestamp *hexnum `json:"timestamp"`
Transactions []*hexdata `json:"transactions"` Transactions []*hexdata `json:"transactions"`
@ -115,7 +111,6 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
ext.Size = b.Size ext.Size = b.Size
ext.ExtraData = b.ExtraData ext.ExtraData = b.ExtraData
ext.GasLimit = b.GasLimit ext.GasLimit = b.GasLimit
ext.MinGasPrice = b.MinGasPrice
ext.GasUsed = b.GasUsed ext.GasUsed = b.GasUsed
ext.UnixTimestamp = b.UnixTimestamp ext.UnixTimestamp = b.UnixTimestamp
ext.Transactions = make([]*hexdata, len(b.Transactions)) ext.Transactions = make([]*hexdata, len(b.Transactions))
@ -151,7 +146,6 @@ func NewBlockRes(block *types.Block, fullTx bool) *BlockRes {
res.Size = newHexNum(block.Size().Int64()) res.Size = newHexNum(block.Size().Int64())
res.ExtraData = newHexData(block.Header().Extra) res.ExtraData = newHexData(block.Header().Extra)
res.GasLimit = newHexNum(block.GasLimit()) res.GasLimit = newHexNum(block.GasLimit())
// res.MinGasPrice =
res.GasUsed = newHexNum(block.GasUsed()) res.GasUsed = newHexNum(block.GasUsed())
res.UnixTimestamp = newHexNum(block.Time()) res.UnixTimestamp = newHexNum(block.Time())