poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

unskip StateTests/stTransactionTest and use test tx nonce

This commit is contained in:
Gustav Simonsson 2015-05-15 16:05:11 +02:00
parent c1f0d40e34
commit dadf01de60
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/helper/vm.go
View File

@ -163,6 +163,7 @@ func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.
gas = common.Big(tx["gasLimit"]) gas = common.Big(tx["gasLimit"])
price = common.Big(tx["gasPrice"]) price = common.Big(tx["gasPrice"])
value = common.Big(tx["value"]) value = common.Big(tx["value"])
nonce = common.Big(tx["nonce"]).Uint64()
caddr = common.HexToAddress(env["currentCoinbase"]) caddr = common.HexToAddress(env["currentCoinbase"])
) )
@ -178,7 +179,7 @@ func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.
coinbase := statedb.GetOrNewStateObject(caddr) coinbase := statedb.GetOrNewStateObject(caddr)
coinbase.SetGasPool(common.Big(env["currentGasLimit"])) coinbase.SetGasPool(common.Big(env["currentGasLimit"]))
message := NewMessage(common.BytesToAddress(keyPair.Address()), to, data, value, gas, price) message := NewMessage(common.BytesToAddress(keyPair.Address()), to, data, value, gas, price, nonce)
vmenv := NewEnvFromMap(statedb, env, tx) vmenv := NewEnvFromMap(statedb, env, tx)
vmenv.origin = common.BytesToAddress(keyPair.Address()) vmenv.origin = common.BytesToAddress(keyPair.Address())
ret, _, err := core.ApplyMessage(vmenv, message, coinbase) ret, _, err := core.ApplyMessage(vmenv, message, coinbase)
@ -195,10 +196,11 @@ type Message struct {
to *common.Address to *common.Address
value, gas, price *big.Int value, gas, price *big.Int
data []byte data []byte
nonce uint64
} }
func NewMessage(from common.Address, to *common.Address, data []byte, value, gas, price *big.Int) Message { func NewMessage(from common.Address, to *common.Address, data []byte, value, gas, price *big.Int, nonce uint64) Message {
return Message{from, to, value, gas, price, data} return Message{from, to, value, gas, price, data, nonce}
} }
func (self Message) Hash() []byte { return nil } func (self Message) Hash() []byte { return nil }
@ -207,5 +209,5 @@ func (self Message) To() *common.Address { return self.to }
func (self Message) GasPrice() *big.Int { return self.price } func (self Message) GasPrice() *big.Int { return self.price }
func (self Message) Gas() *big.Int { return self.gas } func (self Message) Gas() *big.Int { return self.gas }
func (self Message) Value() *big.Int { return self.value } func (self Message) Value() *big.Int { return self.value }
func (self Message) Nonce() uint64 { return 0 } func (self Message) Nonce() uint64 { return self.nonce }
func (self Message) Data() []byte { return self.data } func (self Message) Data() []byte { return self.data }

1
tests/vm/gh_test.go
View File

@ -320,7 +320,6 @@ func TestStateLog(t *testing.T) {
} }
func TestStateTransaction(t *testing.T) { func TestStateTransaction(t *testing.T) {
t.Skip()
const fn = "../files/StateTests/stTransactionTest.json" const fn = "../files/StateTests/stTransactionTest.json"
RunVmTest(fn, t) RunVmTest(fn, t)
} }