From 67e7f61af7fffbc47aadf48777e2dd5da39796ff Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Tue, 18 May 2021 01:10:28 +0200
Subject: [PATCH] core: fix failing tests (#22888)
This PR fixes two errors that regressed when EIP-1559 was merged.
---
core/blockchain_test.go | 4 ++--
core/state_processor_test.go | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index 8ace9f6a6..1869b0f18 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -1357,8 +1357,8 @@ func TestEIP155Transition(t *testing.T) {
}
})
_, err := blockchain.InsertChain(blocks)
- if err != types.ErrInvalidChainId {
- t.Error("expected error:", types.ErrInvalidChainId)
+ if have, want := err, types.ErrInvalidChainId; !errors.Is(have, want) {
+ t.Errorf("have %v, want %v", have, want)
}
}
diff --git a/core/state_processor_test.go b/core/state_processor_test.go
index 28baf6e7d..c15d3d276 100644
--- a/core/state_processor_test.go
+++ b/core/state_processor_test.go
@@ -39,7 +39,22 @@ import (
// contain invalid transactions
func TestStateProcessorErrors(t *testing.T) {
var (
- signer = types.LatestSigner(params.TestChainConfig)
+ config = ¶ms.ChainConfig{
+ ChainID: big.NewInt(1),
+ HomesteadBlock: big.NewInt(0),
+ EIP150Block: big.NewInt(0),
+ EIP155Block: big.NewInt(0),
+ EIP158Block: big.NewInt(0),
+ ByzantiumBlock: big.NewInt(0),
+ ConstantinopleBlock: big.NewInt(0),
+ PetersburgBlock: big.NewInt(0),
+ IstanbulBlock: big.NewInt(0),
+ MuirGlacierBlock: big.NewInt(0),
+ BerlinBlock: big.NewInt(0),
+ LondonBlock: big.NewInt(0),
+ Ethash: new(params.EthashConfig),
+ }
+ signer = types.LatestSigner(config)
testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
)
var makeTx = func(nonce uint64, to common.Address, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte) *types.Transaction {
@@ -61,7 +76,7 @@ func TestStateProcessorErrors(t *testing.T) {
var (
db = rawdb.NewMemoryDatabase()
gspec = &Genesis{
- Config: params.TestChainConfig,
+ Config: config,
Alloc: GenesisAlloc{
common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): GenesisAccount{
Balance: big.NewInt(1000000000000000000), // 1 ether
--
GitLab