From f749c8abc48f27e25fc070d7870421dbd83ebd37 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 31 Jan 2022 14:06:45 -0600 Subject: [PATCH] fix CI --- docker-compose.yml | 11 +++++----- .../indexer/database/sql/postgres/config.go | 4 ++-- statediff/indexer/database/sql/v2/writer.go | 20 +++++++++---------- statediff/indexer/database/sql/v3/writer.go | 14 ++++++------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 001c2650a..a7276b7bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,9 @@ services: POSTGRES_DB: "vulcanize_testing_v2" POSTGRES_PASSWORD: "password" volumes: - - geth_node:/var/lib/postgresql/data + - v2_data:/var/lib/postgresql/data ports: - - "127.0.0.1:5432:5432" + - "127.0.0.1:5433:5432" ipld-eth-db-v3: restart: always @@ -21,9 +21,10 @@ services: POSTGRES_DB: "vulcanize_testing_v3" POSTGRES_PASSWORD: "password" volumes: - - geth_node:/var/lib/postgresql/data + - v3_data:/var/lib/postgresql/data ports: - - "127.0.0.1:5433:5432" + - "127.0.0.1:5432:5432" volumes: - geth_node: + v2_data: + v3_data: diff --git a/statediff/indexer/database/sql/postgres/config.go b/statediff/indexer/database/sql/postgres/config.go index bcaf4e0bf..32259a11b 100644 --- a/statediff/indexer/database/sql/postgres/config.go +++ b/statediff/indexer/database/sql/postgres/config.go @@ -57,7 +57,7 @@ var DefaultConfig = Config{ // DefaultV2Config are default parameters for connecting to a v3 Postgres DB var DefaultV2Config = Config{ Hostname: "localhost", - Port: 5432, + Port: 5433, DatabaseName: "vulcanize_testing_v2", Username: "vdbm", Password: "password", @@ -66,7 +66,7 @@ var DefaultV2Config = Config{ // DefaultV3Config are default parameters for connecting to a v3 Postgres DB var DefaultV3Config = Config{ Hostname: "localhost", - Port: 5433, + Port: 5432, DatabaseName: "vulcanize_testing_v3", Username: "vdbm", Password: "password", diff --git a/statediff/indexer/database/sql/v2/writer.go b/statediff/indexer/database/sql/v2/writer.go index 7b4e2a758..a88a02044 100644 --- a/statediff/indexer/database/sql/v2/writer.go +++ b/statediff/indexer/database/sql/v2/writer.go @@ -78,7 +78,7 @@ func (w *Writer) InsertHeaderCID(tx interfaces.Tx, header *models.HeaderModel) ( header.Reward, header.StateRoot, header.TxRoot, header.RctRoot, header.UncleRoot, header.Bloom, header.Timestamp, header.MhKey, 1, header.BaseFee).Scan(&headerID) if err != nil { - return 0, fmt.Errorf("error inserting header_cids entry: %v", err) + return 0, fmt.Errorf("v2 error inserting header_cids entry: %v", err) } writerV2Metrics.Blocks.Inc(1) return headerID, nil @@ -93,7 +93,7 @@ func (w *Writer) InsertUncleCID(tx interfaces.Tx, uncle *models.UncleModel) erro _, err := tx.Exec(w.DB.Context(), w.DB.InsertUncleStm(), uncle.BlockHash, uncle.HeaderID, uncle.ParentHash, uncle.CID, uncle.Reward, uncle.MhKey) if err != nil { - return fmt.Errorf("error inserting uncle_cids entry: %v", err) + return fmt.Errorf("v2 error inserting uncle_cids entry: %v", err) } return nil } @@ -107,9 +107,9 @@ func (w *Writer) InsertTransactionCID(tx interfaces.Tx, transaction *models.TxMo var txID int64 err := tx.QueryRow(w.DB.Context(), w.DB.InsertTxStm(), transaction.HeaderID, transaction.TxHash, transaction.CID, transaction.Dst, transaction.Src, transaction.Index, - transaction.MhKey, transaction.Data, transaction.Type).Scan(&txID) + transaction.MhKey, transaction.Data, []byte{transaction.Type}).Scan(&txID) if err != nil { - return 0, fmt.Errorf("error inserting transaction_cids entry: %v", err) + return 0, fmt.Errorf("v2 error inserting transaction_cids entry: %v", err) } writerV2Metrics.Transactions.Inc(1) return txID, nil @@ -124,7 +124,7 @@ func (w *Writer) InsertAccessListElement(tx interfaces.Tx, accessListElement *mo _, err := tx.Exec(w.DB.Context(), w.DB.InsertAccessListElementStm(), accessListElement.TxID, accessListElement.Index, accessListElement.Address, accessListElement.StorageKeys) if err != nil { - return fmt.Errorf("error inserting access_list_element entry: %v", err) + return fmt.Errorf("v2 error inserting access_list_element entry: %v", err) } writerV2Metrics.AccessListEntries.Inc(1) return nil @@ -140,7 +140,7 @@ func (w *Writer) InsertReceiptCID(tx interfaces.Tx, rct *models.ReceiptModel) (i err := tx.QueryRow(w.DB.Context(), w.DB.InsertRctStm(), rct.TxID, rct.LeafCID, rct.Contract, rct.ContractHash, rct.LeafMhKey, rct.PostState, rct.PostStatus, rct.LogRoot).Scan(&receiptID) if err != nil { - return 0, fmt.Errorf("error inserting receipt_cids entry: %w", err) + return 0, fmt.Errorf("v2 error inserting receipt_cids entry: %w", err) } writerV2Metrics.Receipts.Inc(1) return receiptID, nil @@ -157,7 +157,7 @@ func (w *Writer) InsertLogCID(tx interfaces.Tx, logs []*models.LogsModel) error log.LeafCID, log.LeafMhKey, log.ReceiptID, log.Address, log.Index, log.Topic0, log.Topic1, log.Topic2, log.Topic3, log.Data) if err != nil { - return fmt.Errorf("error inserting logs entry: %w", err) + return fmt.Errorf("v2 error inserting logs entry: %w", err) } writerV2Metrics.Logs.Inc(1) } @@ -178,7 +178,7 @@ func (w *Writer) InsertStateCID(tx interfaces.Tx, stateNode *models.StateNodeMod err := tx.QueryRow(w.DB.Context(), w.DB.InsertStateStm(), stateNode.HeaderID, stateKey, stateNode.CID, stateNode.Path, stateNode.NodeType, true, stateNode.MhKey).Scan(&stateID) if err != nil { - return 0, fmt.Errorf("error inserting state_cids entry: %v", err) + return 0, fmt.Errorf("v2 error inserting state_cids entry: %v", err) } return stateID, nil } @@ -193,7 +193,7 @@ func (w *Writer) InsertStateAccount(tx interfaces.Tx, stateAccount *models.State stateAccount.StateID, stateAccount.Balance, stateAccount.Nonce, stateAccount.CodeHash, stateAccount.StorageRoot) if err != nil { - return fmt.Errorf("error inserting state_accounts entry: %v", err) + return fmt.Errorf("v2 error inserting state_accounts entry: %v", err) } return nil } @@ -212,7 +212,7 @@ func (w *Writer) InsertStorageCID(tx interfaces.Tx, storageCID *models.StorageNo storageCID.StateID, storageKey, storageCID.CID, storageCID.Path, storageCID.NodeType, true, storageCID.MhKey) if err != nil { - return fmt.Errorf("error inserting storage_cids entry: %v", err) + return fmt.Errorf("v2 error inserting storage_cids entry: %v", err) } return nil } diff --git a/statediff/indexer/database/sql/v3/writer.go b/statediff/indexer/database/sql/v3/writer.go index 2cda907ad..4cf4a5581 100644 --- a/statediff/indexer/database/sql/v3/writer.go +++ b/statediff/indexer/database/sql/v3/writer.go @@ -106,7 +106,7 @@ func (w *Writer) InsertTransactionCID(tx interfaces.Tx, transaction *models.TxMo transaction.HeaderID, transaction.TxHash, transaction.CID, transaction.Dst, transaction.Src, transaction.Index, transaction.MhKey, transaction.Data, transaction.Type, transaction.Value) if err != nil { - return fmt.Errorf("error inserting transaction_cids entry: %v", err) + return fmt.Errorf("v3 error inserting transaction_cids entry: %v", err) } writerV3Metrics.Transactions.Inc(1) return nil @@ -121,7 +121,7 @@ func (w *Writer) InsertAccessListElement(tx interfaces.Tx, accessListElement *mo _, err := tx.Exec(w.DB.Context(), w.DB.InsertAccessListElementStm(), accessListElement.TxID, accessListElement.Index, accessListElement.Address, accessListElement.StorageKeys) if err != nil { - return fmt.Errorf("error inserting access_list_element entry: %v", err) + return fmt.Errorf("v3 error inserting access_list_element entry: %v", err) } writerV3Metrics.AccessListEntries.Inc(1) return nil @@ -136,7 +136,7 @@ func (w *Writer) InsertReceiptCID(tx interfaces.Tx, rct *models.ReceiptModel) er _, err := tx.Exec(w.DB.Context(), w.DB.InsertRctStm(), rct.TxID, rct.LeafCID, rct.Contract, rct.ContractHash, rct.LeafMhKey, rct.PostState, rct.PostStatus, rct.LogRoot) if err != nil { - return fmt.Errorf("error inserting receipt_cids entry: %w", err) + return fmt.Errorf("v3 error inserting receipt_cids entry: %w", err) } writerV3Metrics.Receipts.Inc(1) return nil @@ -153,7 +153,7 @@ func (w *Writer) InsertLogCID(tx interfaces.Tx, logs []*models.LogsModel) error log.LeafCID, log.LeafMhKey, log.ReceiptID, log.Address, log.Index, log.Topic0, log.Topic1, log.Topic2, log.Topic3, log.Data) if err != nil { - return fmt.Errorf("error inserting logs entry: %w", err) + return fmt.Errorf("v3 error inserting logs entry: %w", err) } writerV3Metrics.Logs.Inc(1) } @@ -173,7 +173,7 @@ func (w *Writer) InsertStateCID(tx interfaces.Tx, stateNode *models.StateNodeMod _, err := tx.Exec(w.DB.Context(), w.DB.InsertStateStm(), stateNode.HeaderID, stateKey, stateNode.CID, stateNode.Path, stateNode.NodeType, true, stateNode.MhKey) if err != nil { - return fmt.Errorf("error inserting state_cids entry: %v", err) + return fmt.Errorf("v3 error inserting state_cids entry: %v", err) } return nil } @@ -188,7 +188,7 @@ func (w *Writer) InsertStateAccount(tx interfaces.Tx, stateAccount *models.State stateAccount.HeaderID, stateAccount.StatePath, stateAccount.Balance, stateAccount.Nonce, stateAccount.CodeHash, stateAccount.StorageRoot) if err != nil { - return fmt.Errorf("error inserting state_accounts entry: %v", err) + return fmt.Errorf("v3 error inserting state_accounts entry: %v", err) } return nil } @@ -207,7 +207,7 @@ func (w *Writer) InsertStorageCID(tx interfaces.Tx, storageCID *models.StorageNo storageCID.HeaderID, storageCID.StatePath, storageKey, storageCID.CID, storageCID.Path, storageCID.NodeType, true, storageCID.MhKey) if err != nil { - return fmt.Errorf("error inserting storage_cids entry: %v", err) + return fmt.Errorf("v3 error inserting storage_cids entry: %v", err) } return nil }