diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-21 18:54:59 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-21 18:54:59 +0800 |
commit | dba15d9c3609bcddfc7a4f0fe8f01c48a8bbfbc8 (patch) | |
tree | 298cd91b9102053a65cfb18ae4e43ca7980fb8f3 /tests/util.go | |
parent | 796952a49ac12caa3949587e22a7a03c30a8910c (diff) | |
parent | 80f26086eeb126cb87000f283cb5ccc3df95dbcc (diff) | |
download | dexon-dba15d9c3609bcddfc7a4f0fe8f01c48a8bbfbc8.tar.gz dexon-dba15d9c3609bcddfc7a4f0fe8f01c48a8bbfbc8.tar.zst dexon-dba15d9c3609bcddfc7a4f0fe8f01c48a8bbfbc8.zip |
Merge pull request #1918 from obscuren/get-hash-fix
core, tests: get_hash fix
Diffstat (limited to 'tests/util.go')
-rw-r--r-- | tests/util.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/util.go b/tests/util.go index bbc671169..571161683 100644 --- a/tests/util.go +++ b/tests/util.go @@ -131,8 +131,8 @@ type Env struct { initial bool Gas *big.Int - origin common.Address - //parent common.Hash + origin common.Address + parent common.Hash coinbase common.Address number *big.Int @@ -163,7 +163,7 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues env := NewEnv(state) env.origin = common.HexToAddress(exeValues["caller"]) - //env.parent = common.Hex2Bytes(envValues["previousHash"]) + env.parent = common.HexToHash(envValues["previousHash"]) env.coinbase = common.HexToAddress(envValues["currentCoinbase"]) env.number = common.Big(envValues["currentNumber"]) env.time = common.Big(envValues["currentTimestamp"]) @@ -174,10 +174,8 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues return env } -func (self *Env) Origin() common.Address { return self.origin } -func (self *Env) BlockNumber() *big.Int { return self.number } - -//func (self *Env) PrevHash() []byte { return self.parent } +func (self *Env) Origin() common.Address { return self.origin } +func (self *Env) BlockNumber() *big.Int { return self.number } func (self *Env) Coinbase() common.Address { return self.coinbase } func (self *Env) Time() *big.Int { return self.time } func (self *Env) Difficulty() *big.Int { return self.difficulty } |