diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 21:16:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:16:05 +0800 |
| commit | 4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (patch) | |
| tree | 0f64daac335200ce6fd45d6ee9f62dabc0fb1887 /tests/difficulty_test_util.go | |
| parent | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (diff) | |
| parent | 009d2fe2d650b1a92e28f0decbf5f7fa628779e9 (diff) | |
| download | go-tangerine-1.8.24.tar go-tangerine-1.8.24.tar.gz go-tangerine-1.8.24.tar.bz2 go-tangerine-1.8.24.tar.lz go-tangerine-1.8.24.tar.xz go-tangerine-1.8.24.tar.zst go-tangerine-1.8.24.zip | |
Merge pull request #19370 from karalabe/geth-1.8.24v1.8.24
Backport PR for the v1.8.24 maintenance release
Diffstat (limited to 'tests/difficulty_test_util.go')
| -rw-r--r-- | tests/difficulty_test_util.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf7..fe6e90b02 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -30,18 +30,18 @@ import ( //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go type DifficultyTest struct { - ParentTimestamp *big.Int `json:"parentTimestamp"` + ParentTimestamp uint64 `json:"parentTimestamp"` ParentDifficulty *big.Int `json:"parentDifficulty"` UncleHash common.Hash `json:"parentUncles"` - CurrentTimestamp *big.Int `json:"currentTimestamp"` + CurrentTimestamp uint64 `json:"currentTimestamp"` CurrentBlockNumber uint64 `json:"currentBlockNumber"` CurrentDifficulty *big.Int `json:"currentDifficulty"` } type difficultyTestMarshaling struct { - ParentTimestamp *math.HexOrDecimal256 + ParentTimestamp math.HexOrDecimal64 ParentDifficulty *math.HexOrDecimal256 - CurrentTimestamp *math.HexOrDecimal256 + CurrentTimestamp math.HexOrDecimal64 CurrentDifficulty *math.HexOrDecimal256 UncleHash common.Hash CurrentBlockNumber math.HexOrDecimal64 @@ -56,7 +56,7 @@ func (test *DifficultyTest) Run(config *params.ChainConfig) error { UncleHash: test.UncleHash, } - actual := ethash.CalcDifficulty(config, test.CurrentTimestamp.Uint64(), parent) + actual := ethash.CalcDifficulty(config, test.CurrentTimestamp, parent) exp := test.CurrentDifficulty if actual.Cmp(exp) != 0 { |