statediff/indexer/database/metrics/metrics.go

@@ -253,7 +253,7 @@ func (met *dbMetricsHandles) Update(stats DbStats) {
 
 func ReportAndUpdateDuration(msg string, start time.Time, logger log.Logger, timer metrics.Timer) {
 	since := UpdateDuration(start, timer)
-	logger.Debug(fmt.Sprintf("%s duration=%dms", msg, since.Milliseconds()))
+	logger.Trace(fmt.Sprintf("%s duration=%dms", msg, since.Milliseconds()))
 }
 
 func UpdateDuration(start time.Time, timer metrics.Timer) time.Duration {

statediff/indexer/database/sql/pgx_indexer_legacy_test.go

@@ -28,7 +28,7 @@ import (
 )
 
 func setupLegacyPGXIndexer(t *testing.T) {
-	db, err = postgres.SetupPGXDB(postgres.DefaultConfig)
+	db, err = postgres.SetupPGXDB(postgres.TestConfig)
 	if err != nil {
 		t.Fatal(err)
 	}

statediff/indexer/database/sql/pgx_indexer_test.go

@@ -39,7 +39,7 @@ func setupPGXIndexer(t *testing.T, config postgres.Config) {
 }
 
 func setupPGX(t *testing.T) {
-	setupPGXWithConfig(t, postgres.DefaultConfig)
+	setupPGXWithConfig(t, postgres.TestConfig)
 }
 
 func setupPGXWithConfig(t *testing.T, config postgres.Config) {
@@ -48,7 +48,7 @@ func setupPGXWithConfig(t *testing.T, config postgres.Config) {
 }
 
 func setupPGXNonCanonical(t *testing.T) {
-	setupPGXIndexer(t, postgres.DefaultConfig)
+	setupPGXIndexer(t, postgres.TestConfig)
 	test.SetupTestDataNonCanonical(t, ind)
 }
 
@@ -103,7 +103,7 @@ func TestPGXIndexer(t *testing.T) {
 	})
 
 	t.Run("Publish and index with CopyFrom enabled.", func(t *testing.T) {
-		config := postgres.DefaultConfig
+		config := postgres.TestConfig
 		config.CopyFrom = true
 
 		setupPGXWithConfig(t, config)
@@ -169,7 +169,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) {
 }
 
 func TestPGXWatchAddressMethods(t *testing.T) {
-	setupPGXIndexer(t, postgres.DefaultConfig)
+	setupPGXIndexer(t, postgres.TestConfig)
 	defer tearDown(t)
 	defer checkTxClosure(t, 1, 0, 1)
 

statediff/indexer/database/sql/postgres/config.go

@@ -56,13 +56,14 @@ func ResolveDriverType(str string) (DriverType, error) {
 	}
 }
 
-// DefaultConfig are default parameters for connecting to a Postgres sql
+// TestConfig specifies default parameters for connecting to a testing DB
-var DefaultConfig = Config{
+var TestConfig = Config{
 	Hostname:     "localhost",
 	Port:         8077,
 	DatabaseName: "cerc_testing",
 	Username:     "vdbm",
 	Password:     "password",
+	Driver:       SQLX,
 }
 
 // Config holds params for a Postgres db

statediff/indexer/database/sql/postgres/pgx_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	pgConfig, _ = postgres.MakeConfig(postgres.DefaultConfig)
+	pgConfig, _ = postgres.MakeConfig(postgres.TestConfig)
 	ctx         = context.Background()
 )
 
@@ -111,7 +111,7 @@ func TestPostgresPGX(t *testing.T) {
 		badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
 		badInfo := node.Info{GenesisBlock: badHash, NetworkID: "1", ID: "x123", ClientName: "geth"}
 
-		_, err := postgres.NewPGXDriver(ctx, postgres.DefaultConfig, badInfo)
+		_, err := postgres.NewPGXDriver(ctx, postgres.TestConfig, badInfo)
 		if err == nil {
 			t.Fatal("Expected an error")
 		}

statediff/indexer/database/sql/postgres/sqlx_test.go

@@ -35,7 +35,7 @@ func TestPostgresSQLX(t *testing.T) {
 
 	t.Run("connects to the database", func(t *testing.T) {
 		var err error
-		connStr := postgres.DefaultConfig.DbConnectionString()
+		connStr := postgres.TestConfig.DbConnectionString()
 
 		sqlxdb, err = sqlx.Connect("postgres", connStr)
 		if err != nil {
@@ -58,7 +58,7 @@ func TestPostgresSQLX(t *testing.T) {
 		// sized int, so use string representation of big.Int
 		// and cast on insert
 
-		connStr := postgres.DefaultConfig.DbConnectionString()
+		connStr := postgres.TestConfig.DbConnectionString()
 		db, err := sqlx.Connect("postgres", connStr)
 		if err != nil {
 			t.Fatal(err)
@@ -109,7 +109,7 @@ func TestPostgresSQLX(t *testing.T) {
 		badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
 		badInfo := node.Info{GenesisBlock: badHash, NetworkID: "1", ID: "x123", ClientName: "geth"}
 
-		_, err := postgres.NewSQLXDriver(ctx, postgres.DefaultConfig, badInfo)
+		_, err := postgres.NewSQLXDriver(ctx, postgres.TestConfig, badInfo)
 		if err == nil {
 			t.Fatal("Expected an error")
 		}

statediff/indexer/database/sql/postgres/test_helpers.go

@@ -25,7 +25,7 @@ import (
 
 // SetupSQLXDB is used to setup a sqlx db for tests
 func SetupSQLXDB() (sql.Database, error) {
-	conf := DefaultConfig
+	conf := TestConfig
 	conf.MaxIdle = 0
 	driver, err := NewSQLXDriver(context.Background(), conf, node.Info{})
 	if err != nil {

statediff/service_test.go

@@ -54,8 +54,8 @@ var (
 	parentHeader1 = types.Header{Number: big.NewInt(rand.Int63()), Root: parentRoot1}
 	parentHeader2 = types.Header{Number: big.NewInt(rand.Int63()), Root: parentRoot2}
 
-	parentBlock1 = types.NewBlock(&parentHeader1, nil, nil, nil, new(trie.Trie))
+	parentBlock1 = types.NewBlock(&parentHeader1, nil, nil, nil, trie.NewEmpty(nil))
-	parentBlock2 = types.NewBlock(&parentHeader2, nil, nil, nil, new(trie.Trie))
+	parentBlock2 = types.NewBlock(&parentHeader2, nil, nil, nil, trie.NewEmpty(nil))
 
 	parentHash1 = parentBlock1.Hash()
 	parentHash2 = parentBlock2.Hash()
@@ -67,9 +67,9 @@ var (
 	header2   = types.Header{ParentHash: parentHash2, Root: testRoot2, Number: big.NewInt(2)}
 	header3   = types.Header{ParentHash: common.HexToHash("parent hash"), Root: testRoot3, Number: big.NewInt(3)}
 
-	testBlock1 = types.NewBlock(&header1, nil, nil, nil, new(trie.Trie))
+	testBlock1 = types.NewBlock(&header1, nil, nil, nil, trie.NewEmpty(nil))
-	testBlock2 = types.NewBlock(&header2, nil, nil, nil, new(trie.Trie))
+	testBlock2 = types.NewBlock(&header2, nil, nil, nil, trie.NewEmpty(nil))
-	testBlock3 = types.NewBlock(&header3, nil, nil, nil, new(trie.Trie))
+	testBlock3 = types.NewBlock(&header3, nil, nil, nil, trie.NewEmpty(nil))
 
 	receiptRoot1  = common.HexToHash("0x05")
 	receiptRoot2  = common.HexToHash("0x06")