Geth 1.13 (Cancun) update #8

Merged
roysc merged 18 commits from update-geth-1.13 into v5 2024-08-06 21:06:38 +00:00
4 changed files with 24 additions and 12 deletions
Showing only changes of commit 9593c7bde0 - Show all commits

View File

@ -7,7 +7,6 @@ import (
"testing"
helpers "github.com/cerc-io/plugeth-statediff/test_helpers"
"github.com/cerc-io/plugeth-statediff/test_helpers/chaingen"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
@ -16,6 +15,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen"
"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
)
@ -55,7 +55,7 @@ var _ = Describe("referential integrity", Ordered, func() {
})
blocks, receipts, chain = gen.MakeChain(5)
indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash())
indexer, err := helpers.NewIndexer(context.Background(), chainConfig, gen.Genesis.Hash(), TestDBConfig)
Expect(err).ToNot(HaveOccurred())
helpers.IndexChain(indexer, helpers.IndexChainParams{
StateCache: chain.StateCache(),
@ -65,9 +65,9 @@ var _ = Describe("referential integrity", Ordered, func() {
})
checkedBlock = blocks[5]
db = helpers.SetupDB()
db = SetupDB()
})
AfterAll(func() { helpers.TearDownDB(db) })
AfterAll(func() { helpers.ClearDB(db) })
BeforeEach(func() { tx = db.MustBegin() })
AfterEach(func() {

View File

@ -1,9 +1,12 @@
package validator_test
import (
"context"
"math/big"
"github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres"
"github.com/ethereum/go-ethereum/params"
"github.com/jmoiron/sqlx"
)
var TestChainConfig = &params.ChainConfig{
@ -23,3 +26,13 @@ var TestChainConfig = &params.ChainConfig{
GrayGlacierBlock: big.NewInt(0),
Ethash: new(params.EthashConfig),
}
var TestDBConfig, _ = postgres.TestConfig.WithEnv()
roysc marked this conversation as resolved Outdated

is the _ an error? Should be checked if so

is the _ an error? Should be checked if so
func SetupDB() *sqlx.DB {
db, err := postgres.ConnectSQLX(context.Background(), TestDBConfig)
if err != nil {
panic(err)
}
return db
}

View File

@ -7,7 +7,6 @@ import (
"github.com/cerc-io/plugeth-statediff/indexer/ipld"
helpers "github.com/cerc-io/plugeth-statediff/test_helpers"
"github.com/cerc-io/plugeth-statediff/test_helpers/chaingen"
sdtypes "github.com/cerc-io/plugeth-statediff/types"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/log"
@ -16,6 +15,7 @@ import (
// import server helpers for non-canonical chain data
server_mocks "github.com/cerc-io/ipld-eth-server/v5/pkg/eth/test_helpers"
"github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen"
"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
)
@ -32,7 +32,7 @@ var (
func init() {
// The geth sync logs are noisy, silence them
log.Root().SetHandler(log.DiscardHandler())
log.SetDefault(log.NewLogger(log.DiscardHandler()))
}
func setupStateValidator(t *testing.T) *sqlx.DB {
@ -44,7 +44,7 @@ func setupStateValidator(t *testing.T) *sqlx.DB {
chain.Stop()
})
indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash())
indexer, err := helpers.NewIndexer(context.Background(), chainConfig, gen.Genesis.Hash(), TestDBConfig)
if err != nil {
t.Fatal(err)
}
@ -96,10 +96,9 @@ func setupStateValidator(t *testing.T) *sqlx.DB {
t.Fatal(err)
}
db := helpers.SetupDB()
db := SetupDB()
t.Cleanup(func() {
helpers.TearDownDB(db)
helpers.ClearDB(db)
})
return db
}
@ -119,7 +118,7 @@ func TestStateValidation(t *testing.T) {
t.Fatal(err)
}
if blockToBeValidated == nil {
t.Fatal("blockToBeValidated is nil")
t.Fatal("block was not found")
}
err = validator.ValidateBlock(blockToBeValidated, api.B, i)

View File

@ -5,7 +5,7 @@ services:
restart: on-failure
depends_on:
- ipld-eth-db
image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.5-alpha
image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.2.1-alpha
environment:
DATABASE_USER: "vdbm"
DATABASE_NAME: "cerc_testing"