diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 18:57:02 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 18:57:02 +0800 |
commit | 2e5242f9bbbf8412fa5b6e94da942e69570d860d (patch) | |
tree | 2a5d22c767fb61b4da3e5ad55cd97e2826699f09 /tests | |
parent | cb2c10d8627d253192bf9af74070b62810d76b31 (diff) | |
parent | 4c490db6afeb5a48d3e8d1d65ea8ddc9811d0a6d (diff) | |
download | dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.gz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.bz2 dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.lz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.xz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.zst dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.zip |
Merge pull request #1355 from Gustav-Simonsson/block_header_ts_uint64
Use uint64 for block header timestamp
Diffstat (limited to 'tests')
-rw-r--r-- | tests/util.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/util.go b/tests/util.go index 67650c188..ccdba57e0 100644 --- a/tests/util.go +++ b/tests/util.go @@ -120,7 +120,7 @@ type Env struct { coinbase common.Address number *big.Int - time int64 + time uint64 difficulty *big.Int gasLimit *big.Int @@ -150,7 +150,7 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues //env.parent = common.Hex2Bytes(envValues["previousHash"]) env.coinbase = common.HexToAddress(envValues["currentCoinbase"]) env.number = common.Big(envValues["currentNumber"]) - env.time = common.Big(envValues["currentTimestamp"]).Int64() + env.time = common.Big(envValues["currentTimestamp"]).Uint64() env.difficulty = common.Big(envValues["currentDifficulty"]) env.gasLimit = common.Big(envValues["currentGasLimit"]) env.Gas = new(big.Int) @@ -163,7 +163,7 @@ func (self *Env) BlockNumber() *big.Int { return self.number } //func (self *Env) PrevHash() []byte { return self.parent } func (self *Env) Coinbase() common.Address { return self.coinbase } -func (self *Env) Time() int64 { return self.time } +func (self *Env) Time() uint64 { return self.time } func (self *Env) Difficulty() *big.Int { return self.difficulty } func (self *Env) State() *state.StateDB { return self.state } func (self *Env) GasLimit() *big.Int { return self.gasLimit } |