diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 20:15:57 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 20:15:57 +0800 |
| commit | 5c2f1e00148f16655d3fb63b93920b1108165c56 (patch) | |
| tree | f3b453e05a8da60ceb006b5899554f8fbad86cf4 /tests | |
| parent | a139041d409d0ffaf81c7cf931c6b24299a05705 (diff) | |
| download | dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.gz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.bz2 dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.lz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.xz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.zst dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.zip | |
all: update generated code (#15808)
* core/types, core/vm, eth, tests: regenerate gencodec files
* Makefile: update devtools target
Install protoc-gen-go and print reminders about npm, solc and protoc.
Also switch to github.com/kevinburke/go-bindata because it's more
maintained.
* contracts/ens: update contracts and regenerate with solidity v0.4.19
The newer upstream version of the FIFSRegistrar contract doesn't set the
resolver anymore. The resolver is now deployed separately.
* contracts/release: regenerate with solidity v0.4.19
* contracts/chequebook: fix fallback and regenerate with solidity v0.4.19
The contract didn't have a fallback function, payments would be rejected
when compiled with newer solidity. References to 'mortal' and 'owned'
use the local file system so we can compile without network access.
* p2p/discv5: regenerate with recent stringer
* cmd/faucet: regenerate
* dashboard: regenerate
* eth/tracers: regenerate
* internal/jsre/deps: regenerate
* dashboard: avoid sed -i because it's not portable
* accounts/usbwallet/internal/trezor: fix go generate warnings
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/block_test_util.go | 4 | ||||
| -rw-r--r-- | tests/gen_btheader.go | 4 | ||||
| -rw-r--r-- | tests/gen_tttransaction.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/block_test_util.go b/tests/block_test_util.go index e2d1a0b43..53a5f7fcc 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -86,8 +86,8 @@ type btHeaderMarshaling struct { ExtraData hexutil.Bytes Number *math.HexOrDecimal256 Difficulty *math.HexOrDecimal256 - GasLimit *math.HexOrDecimal64 - GasUsed *math.HexOrDecimal64 + GasLimit math.HexOrDecimal64 + GasUsed math.HexOrDecimal64 Timestamp *math.HexOrDecimal256 } diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 1be659ecb..1e25765c4 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -47,8 +47,8 @@ func (b btHeader) MarshalJSON() ([]byte, error) { enc.UncleHash = b.UncleHash enc.ExtraData = b.ExtraData enc.Difficulty = (*math.HexOrDecimal256)(b.Difficulty) - enc.GasLimit = (math.HexOrDecimal64)(b.GasLimit) - enc.GasUsed = (math.HexOrDecimal64)(b.GasUsed) + enc.GasLimit = math.HexOrDecimal64(b.GasLimit) + enc.GasUsed = math.HexOrDecimal64(b.GasUsed) enc.Timestamp = (*math.HexOrDecimal256)(b.Timestamp) return json.Marshal(&enc) } diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 840bdfdd8..dfdb042fc 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -28,7 +28,7 @@ func (t ttTransaction) MarshalJSON() ([]byte, error) { } var enc ttTransaction enc.Data = t.Data - enc.GasLimit = (math.HexOrDecimal64)(t.GasLimit) + enc.GasLimit = math.HexOrDecimal64(t.GasLimit) enc.GasPrice = (*math.HexOrDecimal256)(t.GasPrice) enc.Nonce = math.HexOrDecimal64(t.Nonce) enc.Value = (*math.HexOrDecimal256)(t.Value) |