Skip to content

Commit cef1fc4

Browse files
ashwinphatakashwinphatak
authored
Merge pull request #225 from deep-stack/pm-v4-schema-fixes
Updates to use v4 multi-node DB setup
2 parents de0954a + 8a4583c commit cef1fc4

File tree

15 files changed

+107
-100
lines changed

15 files changed

+107
-100
lines changed

‎.github/workflows/on-pr.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Run geth unit test
1616
strategy:
1717
matrix:
18-
go-version: [ 1.16.x]
18+
go-version: [1.16.x]
1919
platform: [ubuntu-latest]
2020
runs-on: ${{ matrix.platform }}
2121
env:
@@ -43,7 +43,7 @@ jobs:
4343
GOPATH: /tmp/go
4444
strategy:
4545
matrix:
46-
go-version: [ 1.16.x]
46+
go-version: [1.16.x]
4747
platform: [ubuntu-latest]
4848
runs-on: ${{ matrix.platform }}
4949
steps:
@@ -58,9 +58,6 @@ jobs:
5858
- name: Checkout code
5959
uses: actions/checkout@v2
6060

61-
- name: Start database
62-
run: docker-compose -f docker-compose.yml up -d ipld-eth-db
63-
6461
- name: Run unit tests
6562
run:
66-
make statedifftest
63+
./scripts/run_unit_test.sh

‎docker-compose.yml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ version: "3.2"
22

33
services:
44
ipld-eth-db:
5-
restart: always
6-
image: vulcanize/ipld-eth-db:v3.2.0
5+
restart: on-failure
6+
depends_on:
7+
- access-node
8+
image: migrations-test
79
environment:
8-
POSTGRES_USER: "vdbm"
9-
POSTGRES_DB: "vulcanize_testing_v3"
10-
POSTGRES_PASSWORD: "password"
11-
volumes:
12-
- geth_node:/var/lib/postgresql/data
13-
ports:
14-
- "127.0.0.1:5432:5432"
15-
16-
volumes:
17-
geth_node:
10+
DATABASE_USER: "postgres"
11+
DATABASE_NAME: "vulcanize_testing_v4"
12+
DATABASE_PASSWORD: "password"
13+
DATABASE_HOSTNAME: "access-node"
14+
DATABASE_PORT: 5432

‎go.sum‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,6 @@ github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1
585585
github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
586586
github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
587587
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
588-
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
589588
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
590589
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
591590
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -734,10 +733,8 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
734733
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
735734
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
736735
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
737-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
738736
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
739737
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
740-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
741738
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
742739
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU=
743740
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -792,8 +789,6 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK
792789
golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
793790
golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
794791
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
795-
golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
796-
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
797792
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
798793
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
799794
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎scripts/run_unit_test.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Build database image
6+
docker build -t migrations-test https://github.com/vulcanize/ipld-eth-db.git#sharding
7+
8+
mkdir -p out
9+
10+
# Remove existing docker-multi-node directory
11+
rm -rf out/docker-multi-node/
12+
13+
# Copy over files to setup multi-node database
14+
ID=$(docker create migrations-test)
15+
docker cp $ID:/app/docker-multi-node out/docker-multi-node/
16+
docker rm -v $ID
17+
18+
# Spin up multi-node database
19+
docker-compose -f out/docker-multi-node/docker-compose.test.yml -f docker-compose.yml up ipld-eth-db
20+
sleep 20
21+
22+
# Run unit tests
23+
go clean -testcache
24+
make statedifftest
25+
26+
# Clean up
27+
docker-compose -f out/docker-multi-node/docker-compose.test.yml -f docker-compose.yml down --remove-orphans --volumes
28+
rm -rf out/docker-multi-node/

‎statediff/indexer/database/file/indexer_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ var (
5151
sqlxdb *sqlx.DB
5252
err error
5353
ind interfaces.StateDiffIndexer
54-
ipfsPgGet = `SELECT data FROM public.blocks
55-
WHERE key = $1`
54+
ipfsPgGet = `SELECT COALESCE(data, '') as data FROM public.blocks
55+
WHERE key = $1 AND block_number = $2`
5656
tx1, tx2, tx3, tx4, tx5, rct1, rct2, rct3, rct4, rct5 []byte
5757
mockBlock *types.Block
5858
headerCID, trx1CID, trx2CID, trx3CID, trx4CID, trx5CID cid.Cid
@@ -262,7 +262,7 @@ func TestFileIndexer(t *testing.T) {
262262
mhKey := dshelp.MultihashToDsKey(dc.Hash())
263263
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
264264
var data []byte
265-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
265+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
266266
if err != nil {
267267
t.Fatal(err)
268268
}
@@ -301,7 +301,7 @@ func TestFileIndexer(t *testing.T) {
301301
mhKey := dshelp.MultihashToDsKey(dc.Hash())
302302
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
303303
var data []byte
304-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
304+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
305305
if err != nil {
306306
t.Fatal(err)
307307
}
@@ -425,7 +425,7 @@ func TestFileIndexer(t *testing.T) {
425425
}
426426
for i := range rcts {
427427
results := make([]logIPLD, 0)
428-
pgStr = `SELECT log_cids.index, log_cids.address, log_cids.topic0, log_cids.topic1, data FROM eth.log_cids
428+
pgStr = `SELECT log_cids.index, log_cids.address, COALESCE(log_cids.topic0, '') as topic0, COALESCE(log_cids.topic1, '') as topic1, data FROM eth.log_cids
429429
INNER JOIN eth.receipt_cids ON (log_cids.rct_id = receipt_cids.tx_id)
430430
INNER JOIN public.blocks ON (log_cids.leaf_mh_key = blocks.key)
431431
WHERE receipt_cids.leaf_cid = $1 ORDER BY eth.log_cids.index ASC`
@@ -480,7 +480,7 @@ func TestFileIndexer(t *testing.T) {
480480

481481
for idx, c := range rcts {
482482
result := make([]models.IPLDModel, 0)
483-
pgStr = `SELECT data
483+
pgStr = `SELECT COALESCE(data, '') as data
484484
FROM eth.receipt_cids
485485
INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = public.blocks.key)
486486
WHERE receipt_cids.leaf_cid = $1`
@@ -506,11 +506,11 @@ func TestFileIndexer(t *testing.T) {
506506
mhKey := dshelp.MultihashToDsKey(dc.Hash())
507507
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
508508
var data []byte
509-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
509+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
510510
if err != nil {
511511
t.Fatal(err)
512512
}
513-
postStatePgStr := `SELECT post_state FROM eth.receipt_cids WHERE leaf_cid = $1`
513+
postStatePgStr := `SELECT COALESCE(post_state, '') as post_state FROM eth.receipt_cids WHERE leaf_cid = $1`
514514
switch c {
515515
case rct1CID.String():
516516
require.Equal(t, rctLeaf1, data)
@@ -564,7 +564,7 @@ func TestFileIndexer(t *testing.T) {
564564

565565
// check that state nodes were properly indexed and published
566566
stateNodes := make([]models.StateNodeModel, 0)
567-
pgStr := `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, state_cids.state_path, state_cids.header_id
567+
pgStr := `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, COALESCE(state_cids.state_path, '') as state_path, state_cids.header_id
568568
FROM eth.state_cids INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
569569
WHERE header_cids.block_number = $1 AND node_type != 3`
570570
err = sqlxdb.Select(&stateNodes, pgStr, mocks.BlockNumber.Uint64())
@@ -580,11 +580,11 @@ func TestFileIndexer(t *testing.T) {
580580
}
581581
mhKey := dshelp.MultihashToDsKey(dc.Hash())
582582
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
583-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
583+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
584584
if err != nil {
585585
t.Fatal(err)
586586
}
587-
pgStr = `SELECT cast(block_number AS TEXT), header_id, state_path, cast(balance AS TEXT), nonce, code_hash, storage_root from eth.state_accounts WHERE header_id = $1 AND state_path = $2`
587+
pgStr = `SELECT cast(block_number AS TEXT), header_id, state_path, cast(balance AS TEXT), nonce, COALESCE(code_hash, '') as code_hash, storage_root from eth.state_accounts WHERE header_id = $1 AND state_path = $2`
588588
var account models.StateAccountModel
589589
err = sqlxdb.Get(&account, pgStr, stateNode.HeaderID, stateNode.Path)
590590
if err != nil {
@@ -641,7 +641,7 @@ func TestFileIndexer(t *testing.T) {
641641
mhKey := dshelp.MultihashToDsKey(dc.Hash())
642642
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
643643
require.Equal(t, shared.RemovedNodeMhKey, prefixedKey)
644-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
644+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
645645
if err != nil {
646646
t.Fatal(err)
647647
}
@@ -668,7 +668,7 @@ func TestFileIndexer(t *testing.T) {
668668

669669
// check that storage nodes were properly indexed
670670
storageNodes := make([]models.StorageNodeWithStateKeyModel, 0)
671-
pgStr := `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, storage_cids.storage_path
671+
pgStr := `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, COALESCE(storage_cids.storage_path, '') as storage_path
672672
FROM eth.storage_cids, eth.state_cids, eth.header_cids
673673
WHERE (storage_cids.state_path, storage_cids.header_id) = (state_cids.state_path, state_cids.header_id)
674674
AND state_cids.header_id = header_cids.block_hash
@@ -694,15 +694,15 @@ func TestFileIndexer(t *testing.T) {
694694
}
695695
mhKey := dshelp.MultihashToDsKey(dc.Hash())
696696
prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
697-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
697+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
698698
if err != nil {
699699
t.Fatal(err)
700700
}
701701
require.Equal(t, mocks.StorageLeafNode, data)
702702

703703
// check that Removed storage nodes were properly indexed
704704
storageNodes = make([]models.StorageNodeWithStateKeyModel, 0)
705-
pgStr = `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, storage_cids.storage_path
705+
pgStr = `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, COALESCE(storage_cids.storage_path, '') as storage_path
706706
FROM eth.storage_cids, eth.state_cids, eth.header_cids
707707
WHERE (storage_cids.state_path, storage_cids.header_id) = (state_cids.state_path, state_cids.header_id)
708708
AND state_cids.header_id = header_cids.block_hash
@@ -747,8 +747,8 @@ func TestFileIndexer(t *testing.T) {
747747
}
748748
mhKey = dshelp.MultihashToDsKey(dc.Hash())
749749
prefixedKey = blockstore.BlockPrefix.String() + mhKey.String()
750-
require.Equal(t, shared.RemovedNodeMhKey, prefixedKey)
751-
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey)
750+
require.Equal(t, shared.RemovedNodeMhKey, prefixedKey, mocks.BlockNumber.Uint64())
751+
err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
752752
if err != nil {
753753
t.Fatal(err)
754754
}

‎statediff/indexer/database/file/mainnet_tests/indexer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func setup(t *testing.T, testBlock *types.Block, testReceipts types.Receipts) {
107107
require.NoError(t, err)
108108
}
109109

110-
test_helpers.ExpectEqual(t, tx.(*file.BatchTx).BlockNumber, testBlock.Number().Uint64())
110+
require.Equal(t, testBlock.Number().String(), tx.(*file.BatchTx).BlockNumber)
111111

112112
connStr := postgres.DefaultConfig.DbConnectionString()
113113

‎statediff/indexer/database/sql/indexer_shared_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222
db sql.Database
2323
err error
2424
ind interfaces.StateDiffIndexer
25-
ipfsPgGet = `SELECT data FROM public.blocks
25+
ipfsPgGet = `SELECT COALESCE(data, '') as data FROM public.blocks
2626
WHERE key = $1 AND block_number = $2`
2727
tx1, tx2, tx3, tx4, tx5, rct1, rct2, rct3, rct4, rct5 []byte
2828
mockBlock *types.Block

‎statediff/indexer/database/sql/mainnet_tests/indexer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func setup(t *testing.T, testBlock *types.Block, testReceipts types.Receipts) {
9999
require.NoError(t, err)
100100
}
101101

102-
test_helpers.ExpectEqual(t, tx.(*sql.BatchTx).BlockNumber, testBlock.Number().Uint64())
102+
require.Equal(t, testBlock.Number().String(), tx.(*sql.BatchTx).BlockNumber)
103103
}
104104

105105
func tearDown(t *testing.T) {

‎statediff/indexer/database/sql/pgx_indexer_test.go‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import (
2121
"math/big"
2222
"testing"
2323

24-
"github.com/lib/pq"
25-
2624
"github.com/ipfs/go-cid"
2725
blockstore "github.com/ipfs/go-ipfs-blockstore"
2826
dshelp "github.com/ipfs/go-ipfs-ds-help"
@@ -207,14 +205,6 @@ func TestPGXIndexer(t *testing.T) {
207205
if txRes.Value != transactions[3].Value().String() {
208206
t.Fatalf("expected tx value %s got %s", transactions[3].Value().String(), txRes.Value)
209207
}
210-
// AccessListElementModel is the db model for eth.access_list_entry
211-
type AccessListElementModel struct {
212-
BlockNumber string `db:"block_number"`
213-
Index int64 `db:"index"`
214-
TxID string `db:"tx_id"`
215-
Address string `db:"address"`
216-
StorageKeys pq.StringArray `db:"storage_keys"`
217-
}
218208
accessListElementModels := make([]models.AccessListElementModel, 0)
219209
pgStr = "SELECT cast(access_list_elements.block_number AS TEXT), access_list_elements.index, access_list_elements.tx_id, " +
220210
"access_list_elements.address, access_list_elements.storage_keys FROM eth.access_list_elements " +
@@ -267,7 +257,7 @@ func TestPGXIndexer(t *testing.T) {
267257
AND transaction_cids.header_id = header_cids.block_hash
268258
AND header_cids.block_number = $1
269259
ORDER BY transaction_cids.index`
270-
logsPgStr := `SELECT log_cids.index, log_cids.address, log_cids.topic0, log_cids.topic1, data FROM eth.log_cids
260+
logsPgStr := `SELECT log_cids.index, log_cids.address, COALESCE(log_cids.topic0, '') as topic0, COALESCE(log_cids.topic1, '') as topic1, data FROM eth.log_cids
271261
INNER JOIN eth.receipt_cids ON (log_cids.rct_id = receipt_cids.tx_id)
272262
INNER JOIN public.blocks ON (log_cids.leaf_mh_key = blocks.key)
273263
WHERE receipt_cids.leaf_cid = $1 ORDER BY eth.log_cids.index ASC`
@@ -338,7 +328,7 @@ func TestPGXIndexer(t *testing.T) {
338328

339329
for idx, c := range rcts {
340330
result := make([]models.IPLDModel, 0)
341-
pgStr = `SELECT data
331+
pgStr = `SELECT COALESCE(data, '') as data
342332
FROM eth.receipt_cids
343333
INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = public.blocks.key)
344334
WHERE receipt_cids.leaf_cid = $1`
@@ -369,7 +359,7 @@ func TestPGXIndexer(t *testing.T) {
369359
t.Fatal(err)
370360
}
371361

372-
postStatePgStr := `SELECT post_state FROM eth.receipt_cids WHERE leaf_cid = $1`
362+
postStatePgStr := `SELECT COALESCE(post_state, '') as post_state FROM eth.receipt_cids WHERE leaf_cid = $1`
373363
switch c {
374364
case rct1CID.String():
375365
require.Equal(t, rctLeaf1, data)
@@ -422,7 +412,7 @@ func TestPGXIndexer(t *testing.T) {
422412
defer checkTxClosure(t, 1, 0, 1)
423413
// check that state nodes were properly indexed and published
424414
stateNodes := make([]models.StateNodeModel, 0)
425-
pgStr := `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, state_cids.state_path, state_cids.header_id
415+
pgStr := `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, COALESCE(state_cids.state_path, '') as state_path, state_cids.header_id
426416
FROM eth.state_cids INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
427417
WHERE header_cids.block_number = $1 AND node_type != 3`
428418
err = db.Select(context.Background(), &stateNodes, pgStr, mocks.BlockNumber.Uint64())
@@ -442,7 +432,7 @@ func TestPGXIndexer(t *testing.T) {
442432
if err != nil {
443433
t.Fatal(err)
444434
}
445-
pgStr = `SELECT cast(block_number AS TEXT), header_id, state_path, cast(balance AS TEXT), nonce, code_hash, storage_root from eth.state_accounts WHERE header_id = $1 AND state_path = $2`
435+
pgStr = `SELECT cast(block_number AS TEXT), header_id, state_path, cast(balance AS TEXT), nonce, COALESCE(code_hash, '') as code_hash, storage_root from eth.state_accounts WHERE header_id = $1 AND state_path = $2`
446436
var account models.StateAccountModel
447437
err = db.Get(context.Background(), &account, pgStr, stateNode.HeaderID, stateNode.Path)
448438
if err != nil {
@@ -482,7 +472,7 @@ func TestPGXIndexer(t *testing.T) {
482472

483473
// check that Removed state nodes were properly indexed and published
484474
stateNodes = make([]models.StateNodeModel, 0)
485-
pgStr = `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, state_cids.state_path, state_cids.header_id
475+
pgStr = `SELECT state_cids.cid, state_cids.state_leaf_key, state_cids.node_type, COALESCE(state_cids.state_path, '') as state_path, state_cids.header_id
486476
FROM eth.state_cids INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
487477
WHERE header_cids.block_number = $1 AND node_type = 3`
488478
err = db.Select(context.Background(), &stateNodes, pgStr, mocks.BlockNumber.Uint64())
@@ -525,7 +515,7 @@ func TestPGXIndexer(t *testing.T) {
525515
defer checkTxClosure(t, 1, 0, 1)
526516
// check that storage nodes were properly indexed
527517
storageNodes := make([]models.StorageNodeWithStateKeyModel, 0)
528-
pgStr := `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, storage_cids.storage_path
518+
pgStr := `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, COALESCE(storage_cids.storage_path, '') as storage_path
529519
FROM eth.storage_cids, eth.state_cids, eth.header_cids
530520
WHERE (storage_cids.state_path, storage_cids.header_id) = (state_cids.state_path, state_cids.header_id)
531521
AND state_cids.header_id = header_cids.block_hash
@@ -559,7 +549,7 @@ func TestPGXIndexer(t *testing.T) {
559549

560550
// check that Removed storage nodes were properly indexed
561551
storageNodes = make([]models.StorageNodeWithStateKeyModel, 0)
562-
pgStr = `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, storage_cids.storage_path
552+
pgStr = `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.cid, state_cids.state_leaf_key, storage_cids.storage_leaf_key, storage_cids.node_type, COALESCE(storage_cids.storage_path, '') as storage_path
563553
FROM eth.storage_cids, eth.state_cids, eth.header_cids
564554
WHERE (storage_cids.state_path, storage_cids.header_id) = (state_cids.state_path, state_cids.header_id)
565555
AND state_cids.header_id = header_cids.block_hash

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ func ResolveDriverType(str string) (DriverType, error) {
4848
// DefaultConfig are default parameters for connecting to a Postgres sql
4949
var DefaultConfig = Config{
5050
Hostname: "localhost",
51-
Port: 5432,
51+
Port: 8066,
5252
DatabaseName: "vulcanize_testing_v4",
5353
Username: "postgres",
54-
Password: "",
54+
Password: "password",
5555
}
5656

5757
// Config holds params for a Postgres db

0 commit comments

Comments
 (0)