From 80f26086eeb126cb87000f283cb5ccc3df95dbcc Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Wed, 21 Oct 2015 02:31:46 +0200 Subject: core, tests: get_hash fix Make sure that we're fetching the hash from the current chain and not the canonical chain. --- tests/util.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/util.go') 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 } -- cgit