eth,ethclient: Fix deprecated type usage, reinstate SA1019 lint

Author: sebastianst

.golangci.yml

@@ -78,4 +78,3 @@ issues:
     - 'SA1019: strings.Title is deprecated'
     - 'SA1019: strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.'
     - 'SA1029: should not use built-in type string as key for value'
-    - 'SA1019:' # temporary, until fully updated to Go 1.21

eth/catalyst/superchain_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/eth/downloader"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/params"
@@ -59,7 +58,7 @@ func TestSignalSuperchainV1Halt(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.cfg+"_"+tc.bump, func(t *testing.T) {
 			genesis, preMergeBlocks := generateMergeChain(2, false)
-			ethcfg := &ethconfig.Config{Genesis: genesis, SyncMode: downloader.FullSync, TrieTimeout: time.Minute, TrieDirtyCache: 256, TrieCleanCache: 256}
+			ethcfg := &ethconfig.Config{Genesis: genesis, SyncMode: ethconfig.FullSync, TrieTimeout: time.Minute, TrieDirtyCache: 256, TrieCleanCache: 256}
 			ethcfg.RollupHaltOnIncompatibleProtocolVersion = tc.cfg // opt-in to halting (or not)
 			n, ethservice := startEthServiceWithConfigFn(t, preMergeBlocks, ethcfg)
 			defer n.Close() // close at the end, regardless of any prior (failed) closing

eth/tracers/api_test.go

@@ -636,7 +636,7 @@ func TestTraceTransactionHistorical(t *testing.T) {
 	accounts := newAccounts(2)
 	genesis := &core.Genesis{
 		Config: params.OptimismTestConfig,
-		Alloc: core.GenesisAlloc{
+		Alloc: types.GenesisAlloc{
 			accounts[0].addr: {Balance: big.NewInt(params.Ether)},
 			accounts[1].addr: {Balance: big.NewInt(params.Ether)},
 		},
@@ -781,7 +781,7 @@ func TestTraceBlockHistorical(t *testing.T) {
 	accounts := newAccounts(3)
 	genesis := &core.Genesis{
 		Config: params.OptimismTestConfig,
-		Alloc: core.GenesisAlloc{
+		Alloc: types.GenesisAlloc{
 			accounts[0].addr: {Balance: big.NewInt(params.Ether)},
 			accounts[1].addr: {Balance: big.NewInt(params.Ether)},
 			accounts[2].addr: {Balance: big.NewInt(params.Ether)},

ethclient/ethclient_test.go

@@ -85,7 +85,7 @@ var genesis = &core.Genesis{
 
 var genesisForHistorical = &core.Genesis{
 	Config:    params.OptimismTestConfig,
-	Alloc:     core.GenesisAlloc{testAddr: {Balance: testBalance}},
+	Alloc:     types.GenesisAlloc{testAddr: {Balance: testBalance}},
 	ExtraData: []byte("test genesis"),
 	Timestamp: 9000,
 	BaseFee:   big.NewInt(params.InitialBaseFee),