cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Enable more tx tests by expecting most common encoding of values

Browse Source
This commit is contained in:
Gustav Simonsson 2015-04-10 12:34:55 +02:00
parent 6dc2146ed7
commit 6d20d634ca
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/transaction_test.go
View File

@ -9,16 +9,8 @@ func TestTransactions(t *testing.T) {
// TODO: all commented out tests should work!
snafus := []string{
"AddressLessThan20Prefixed0",
"DataTest",
"EmptyTransaction",
"RightVRSTest",
"SenderTest",
"TransactionWithGasLimitxPriceOverflow",
"TransactionWithHihghGas",
"TransactionWithHihghGasPrice",
"TransactionWithHihghNonce",
"TransactionWithHihghValue",
"TransactionWithRvalueWrongSize",
"TransactionWithSvalueHigh",
"TransactionWithSvalueTooHigh",
@ -26,7 +18,8 @@ func TestTransactions(t *testing.T) {
"ValuesAsDec",
"ValuesAsHex",
"libsecp256k1test",
"unpadedRValue"}
"unpadedRValue",
}
for _, name := range snafus {
notWorking[name] = true

12
tests/transaction_test_util.go
View File

@ -30,7 +30,7 @@ type TransactionTest struct {
Transaction TtTransaction
}
func RunTransactionTests(file string, notWorking map[string]bool) error {
func RunTransactionTests(file string, notWorking map[string]bool) error {
bt := make(map[string]TransactionTest)
if err := LoadJSON(file, &bt); err != nil {
return err
@ -60,7 +60,7 @@ func runTest(txTest TransactionTest) (err error) {
}
tx := new(types.Transaction)
rlp.DecodeBytes(rlpBytes, tx)
//fmt.Println("HURR tx: %v", tx)
sender, err := tx.From()
if err != nil {
return err
@ -120,15 +120,15 @@ func convertTestTypes(txTest TransactionTest) (sender, to common.Address,
txInputData = mustConvertBytes(txTest.Transaction.Data)
rlpBytes = mustConvertBytes(txTest.Rlp)
gasLimit = mustConvertBigIntHex(txTest.Transaction.GasLimit)
gasPrice = mustConvertBigIntHex(txTest.Transaction.GasPrice)
value = mustConvertBigIntHex(txTest.Transaction.Value)
gasLimit = mustConvertBigInt10(txTest.Transaction.GasLimit)
gasPrice = mustConvertBigInt10(txTest.Transaction.GasPrice)
value = mustConvertBigInt10(txTest.Transaction.Value)
r = common.Bytes2Big(mustConvertBytes(txTest.Transaction.R))
s = common.Bytes2Big(mustConvertBytes(txTest.Transaction.S))
nonce = mustConvertUintHex(txTest.Transaction.Nonce)
v = mustConvertUintHex(txTest.Transaction.V)
v = mustConvertUint(txTest.Transaction.V)
return sender, to, txInputData, rlpBytes, gasLimit, gasPrice, value, r, s, nonce, v, nil
}