forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: refactor transaction tests

Browse source
This commit is contained in:
Martin Holst Swende 2019-05-06 10:15:39 +02:00
parent e98dc75d6c
commit 01ea671644
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 35 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
tests/transaction_test_util.go
View file

@ -18,7 +18,6 @@ package tests
import ( import (
"fmt" "fmt"
"math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
@ -39,10 +38,6 @@ type TransactionTest struct {
Homestead ttFork Homestead ttFork
} }
type ttJSON struct {
RLP hexutil.Bytes `json:"rlp"`
}
type ttFork struct { type ttFork struct {
Sender common.UnprefixedAddress `json:"sender"` Sender common.UnprefixedAddress `json:"sender"`
Hash common.UnprefixedHash `json:"hash"` Hash common.UnprefixedHash `json:"hash"`
@ -50,67 +45,64 @@ type ttFork struct {
func (tt *TransactionTest) Run(config *params.ChainConfig) error { func (tt *TransactionTest) Run(config *params.ChainConfig) error {
validateTx := func(rlpData hexutil.Bytes, signer types.Signer, block *big.Int) (*common.Address, error) { validateTx := func(rlpData hexutil.Bytes, signer types.Signer, isHomestead bool) (*common.Address, *common.Hash, error) {
tx := new(types.Transaction) tx := new(types.Transaction)
if err := rlp.DecodeBytes(rlpData, tx); err != nil { if err := rlp.DecodeBytes(rlpData, tx); err != nil {
return nil, err return nil, nil, err
} }
sender, err := types.Sender(signer, tx) sender, err := types.Sender(signer, tx)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
// Intrinsic gas // Intrinsic gas
requiredGas, err := core.IntrinsicGas(tx.Data(), tx.To() == nil, config.IsHomestead(block)) requiredGas, err := core.IntrinsicGas(tx.Data(), tx.To() == nil, isHomestead)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
if requiredGas > tx.Gas() { if requiredGas > tx.Gas() {
return nil, fmt.Errorf("insufficient gas ( %d < %d )", tx.Gas(), requiredGas) return nil, nil, fmt.Errorf("insufficient gas ( %d < %d )", tx.Gas(), requiredGas)
} }
//if signer.Hash(tx) != common.Hash(fork.Hash) { h := tx.Hash()
// return fmt.Errorf("Tx hash mismatch, got %v want %v", signer.Hash(tx), fork.Hash) return &sender, &h, nil
//}
return &sender, nil
} }
checkFork := func(block *big.Int, fork ttFork, rlpData hexutil.Bytes) error { for _, testcase := range []struct {
signer := types.MakeSigner(config, block) name string
sender, err := validateTx(rlpData, signer, block) signer types.Signer
fork ttFork
isHomestead bool
}{
{"Frontier", types.FrontierSigner{}, tt.Frontier, false},
{"Homestead", types.HomesteadSigner{}, tt.Homestead, true},
{"EIP150", types.HomesteadSigner{}, tt.EIP150, true},
{"EIP158", types.NewEIP155Signer(config.ChainID), tt.EIP158, true},
{"Byzantium", types.NewEIP155Signer(config.ChainID), tt.Byzantium, true},
{"Constantinople", types.NewEIP155Signer(config.ChainID), tt.Constantinople, true},
} {
sender, txhash, err := validateTx(tt.RLP, testcase.signer, testcase.isHomestead)
// This testcase has an invalid tx if testcase.fork.Sender == (common.UnprefixedAddress{}) {
if fork.Sender == (common.UnprefixedAddress{}) {
if err == nil { if err == nil {
return fmt.Errorf("Expected error, got none (address %v)", sender.String()) return fmt.Errorf("Expected error, got none (address %v)", sender.String())
} }
continue
return nil
} }
// Should resolve the right address // Should resolve the right address
if err != nil { if err != nil {
return fmt.Errorf("Got error, expected none: %v", err) return fmt.Errorf("Got error, expected none: %v", err)
} }
if *sender != common.Address(fork.Sender) { if sender == nil {
return fmt.Errorf("Sender mismatch: got %x, want %x", sender, fork.Sender) return fmt.Errorf("sender was nil, should be %x", common.Address(testcase.fork.Sender))
} }
return nil if *sender != common.Address(testcase.fork.Sender) {
} return fmt.Errorf("Sender mismatch: got %x, want %x", sender, testcase.fork.Sender)
if err := checkFork(new(big.Int), tt.Frontier, tt.RLP); err != nil { }
return fmt.Errorf("Frontier: %v", err) if txhash == nil {
} return fmt.Errorf("txhash was nil, should be %x", common.Hash(testcase.fork.Hash))
if err := checkFork(config.HomesteadBlock, tt.Homestead, tt.RLP); err != nil { }
return fmt.Errorf("Homestead: %v", err) if *txhash != common.Hash(testcase.fork.Hash) {
} return fmt.Errorf("Hash mismatch: got %x, want %x", *txhash, testcase.fork.Hash)
if err := checkFork(config.EIP150Block, tt.EIP150, tt.RLP); err != nil { }
return fmt.Errorf("EIP150: %v", err)
}
if err := checkFork(config.EIP158Block, tt.EIP158, tt.RLP); err != nil {
return fmt.Errorf("EIP158: %v", err)
}
if err := checkFork(config.ByzantiumBlock, tt.Byzantium, tt.RLP); err != nil {
return fmt.Errorf("Byzantium: %v", err)
}
if err := checkFork(config.ConstantinopleBlock, tt.Constantinople, tt.RLP); err != nil {
return fmt.Errorf("Constantinople: %v", err)
} }
return nil return nil
} }