tests: hopefully improve test conversion helpers

(cherry picked from commit 035a30acbe)
This commit is contained in:
Felix Lange
2015-04-17 18:20:32 +02:00
committed by Gustav Simonsson
parent 235ed7ecb9
commit c453f1f370
2 changed files with 35 additions and 30 deletions

View File

@ -127,15 +127,15 @@ func convertTestTypes(txTest TransactionTest) (sender, to common.Address,
txInputData = mustConvertBytes(txTest.Transaction.Data)
rlpBytes = mustConvertBytes(txTest.Rlp)
gasLimit = mustConvertBigInt(txTest.Transaction.GasLimit)
gasPrice = mustConvertBigInt(txTest.Transaction.GasPrice)
value = mustConvertBigInt(txTest.Transaction.Value)
gasLimit = mustConvertBigInt(txTest.Transaction.GasLimit, 16)
gasPrice = mustConvertBigInt(txTest.Transaction.GasPrice, 16)
value = mustConvertBigInt(txTest.Transaction.Value, 16)
r = common.Bytes2Big(mustConvertBytes(txTest.Transaction.R))
s = common.Bytes2Big(mustConvertBytes(txTest.Transaction.S))
nonce = mustConvertUint(txTest.Transaction.Nonce)
v = mustConvertUint(txTest.Transaction.V)
nonce = mustConvertUint(txTest.Transaction.Nonce, 16)
v = mustConvertUint(txTest.Transaction.V, 16)
return sender, to, txInputData, rlpBytes, gasLimit, gasPrice, value, r, s, nonce, v, nil
}