@@ -29,7 +29,11 @@ import (
29
29
30
30
// TransactionTest checks RLP decoding and sender derivation of transactions.
31
31
type TransactionTest struct {
32
- RLP hexutil.Bytes `json:"rlp"`
32
+ Txbytes hexutil.Bytes `json:"txbytes"`
33
+ Result ttResult
34
+ }
35
+
36
+ type ttResult struct {
33
37
Byzantium ttFork
34
38
Constantinople ttFork
35
39
Istanbul ttFork
@@ -73,15 +77,15 @@ func (tt *TransactionTest) Run(config *params.ChainConfig) error {
73
77
isHomestead bool
74
78
isIstanbul bool
75
79
}{
76
- {"Frontier" , types.FrontierSigner {}, tt .Frontier , false , false },
77
- {"Homestead" , types.HomesteadSigner {}, tt .Homestead , true , false },
78
- {"EIP150" , types.HomesteadSigner {}, tt .EIP150 , true , false },
79
- {"EIP158" , types .NewEIP155Signer (config .ChainID ), tt .EIP158 , true , false },
80
- {"Byzantium" , types .NewEIP155Signer (config .ChainID ), tt .Byzantium , true , false },
81
- {"Constantinople" , types .NewEIP155Signer (config .ChainID ), tt .Constantinople , true , false },
82
- {"Istanbul" , types .NewEIP155Signer (config .ChainID ), tt .Istanbul , true , true },
80
+ {"Frontier" , types.FrontierSigner {}, tt .Result . Frontier , false , false },
81
+ {"Homestead" , types.HomesteadSigner {}, tt .Result . Homestead , true , false },
82
+ {"EIP150" , types.HomesteadSigner {}, tt .Result . EIP150 , true , false },
83
+ {"EIP158" , types .NewEIP155Signer (config .ChainID ), tt .Result . EIP158 , true , false },
84
+ {"Byzantium" , types .NewEIP155Signer (config .ChainID ), tt .Result . Byzantium , true , false },
85
+ {"Constantinople" , types .NewEIP155Signer (config .ChainID ), tt .Result . Constantinople , true , false },
86
+ {"Istanbul" , types .NewEIP155Signer (config .ChainID ), tt .Result . Istanbul , true , true },
83
87
} {
84
- sender , txhash , err := validateTx (tt .RLP , testcase .signer , testcase .isHomestead , testcase .isIstanbul )
88
+ sender , txhash , err := validateTx (tt .Txbytes , testcase .signer , testcase .isHomestead , testcase .isIstanbul )
85
89
86
90
if testcase .fork .Sender == (common.UnprefixedAddress {}) {
87
91
if err == nil {
0 commit comments