Skip to content

Commit d629c99

Browse files
abdulrabbani00abdulrabbani00
authored
Handle conflicts (#244)
* Handle conflicts * Update go mod file versions * Make lint changes
1 parent d42a21f commit d629c99

File tree

11 files changed

+126
-127
lines changed

11 files changed

+126
-127
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_call:
55

66
env:
7-
stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref || 'feature/geth-testing'}}
8-
ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref || 'feature/startup-script' }}
7+
stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref || '382aca8e42bc5e33f301f77cdd2e09cc80602fc3'}}
8+
ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref || '48eb594ea95763bda8e51590f105f7a2657ac6d4' }}
99
GOPATH: /tmp/go
1010

1111
jobs:
@@ -70,15 +70,13 @@ jobs:
7070
- name: Create config file
7171
run: |
7272
echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > $GITHUB_WORKSPACE/config.sh
73-
echo vulcanize_go_ethereum=$GITHUB_WORKSPACE/go-ethereum/ >> $GITHUB_WORKSPACE/config.sh
7473
echo db_write=true >> $GITHUB_WORKSPACE/config.sh
7574
cat $GITHUB_WORKSPACE/config.sh
7675
7776
- name: Run docker compose
7877
run: |
7978
docker-compose \
80-
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
81-
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
79+
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \
8280
--env-file $GITHUB_WORKSPACE/config.sh \
8381
up -d --build
8482
@@ -135,9 +133,8 @@ jobs:
135133
- name: Run docker compose
136134
run: |
137135
docker-compose \
138-
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
139-
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum4.yml" \
140-
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
136+
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
137+
-f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \
141138
--env-file $GITHUB_WORKSPACE/config.sh \
142139
up -d --build
143140
@@ -160,7 +157,7 @@ jobs:
160157
- name: Make sure we see entries in the header table
161158
shell: bash
162159
run: |
163-
rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec access-node psql -U vdbm -d vulcanize_testing_v4 -AXqtc "SELECT COUNT(*) FROM eth.header_cids")
160+
rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids")
164161
[[ "$rows" -lt "1" ]] && echo "We could not find any rows in postgres table." && (exit 1)
165162
echo $rows
166-
docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec access-node psql -U vdbm -d vulcanize_testing_v4 -AXqtc "SELECT * FROM eth.header_cids"
163+
docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT * FROM eth.header_cids"

‎cmd/geth/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
241241
pgConfig.MaxIdle = ctx.GlobalInt(utils.StateDiffDBMaxIdleConns.Name)
242242
}
243243
if ctx.GlobalIsSet(utils.StateDiffDBMaxConnLifetime.Name) {
244-
pgConfig.MaxConnLifetime = ctx.GlobalDuration(utils.StateDiffDBMaxConnLifetime.Name) * time.Second
244+
pgConfig.MaxConnLifetime = time.Duration(ctx.GlobalDuration(utils.StateDiffDBMaxConnLifetime.Name).Seconds())
245245
}
246246
if ctx.GlobalIsSet(utils.StateDiffDBMaxConnIdleTime.Name) {
247-
pgConfig.MaxConnIdleTime = ctx.GlobalDuration(utils.StateDiffDBMaxConnIdleTime.Name) * time.Second
247+
pgConfig.MaxConnIdleTime = time.Duration(ctx.GlobalDuration(utils.StateDiffDBMaxConnIdleTime.Name).Seconds())
248248
}
249249
if ctx.GlobalIsSet(utils.StateDiffDBConnTimeout.Name) {
250-
pgConfig.ConnTimeout = ctx.GlobalDuration(utils.StateDiffDBConnTimeout.Name) * time.Second
250+
pgConfig.ConnTimeout = time.Duration(ctx.GlobalDuration(utils.StateDiffDBConnTimeout.Name).Seconds())
251251
}
252252
indexerConfig = pgConfig
253253
case shared.DUMP:

‎go.mod‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5
2424
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff
2525
github.com/georgysavva/scany v0.2.9
26-
github.com/go-ole/go-ole v1.2.6 // indirect
26+
github.com/go-ole/go-ole v1.2.1 // indirect
2727
github.com/go-stack/stack v1.8.0
2828
github.com/golang-jwt/jwt/v4 v4.3.0
2929
github.com/golang/protobuf v1.4.3
@@ -40,12 +40,35 @@ require (
4040
github.com/influxdata/influxdb v1.8.3
4141
github.com/influxdata/influxdb-client-go/v2 v2.4.0
4242
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
43+
github.com/ipfs/go-block-format v0.0.2
44+
github.com/ipfs/go-cid v0.0.7
45+
github.com/ipfs/go-ipfs-blockstore v1.0.1
46+
github.com/ipfs/go-ipfs-ds-help v1.0.0
47+
github.com/ipfs/go-ipld-format v0.2.0
48+
github.com/jackc/pgconn v1.10.0
49+
github.com/jackc/pgx/v4 v4.13.0
50+
github.com/jackpal/go-nat-pmp v1.0.2
51+
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e
52+
github.com/jmoiron/sqlx v1.2.0
53+
github.com/julienschmidt/httprouter v1.2.0
54+
github.com/karalabe/usb v0.0.2
55+
github.com/kylelemons/godebug v1.1.0 // indirect
56+
github.com/lib/pq v1.10.2
57+
github.com/mattn/go-colorable v0.1.8
58+
github.com/mattn/go-isatty v0.0.12
59+
github.com/multiformats/go-multihash v0.0.14
60+
github.com/naoina/go-stringutil v0.1.0 // indirect
61+
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
62+
github.com/olekukonko/tablewriter v0.0.5
4363
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
4464
github.com/pganalyze/pg_query_go/v2 v2.1.0
65+
github.com/prometheus/tsdb v0.7.1
4566
github.com/rjeczalik/notify v0.9.1
4667
github.com/rs/cors v1.7.0
68+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
4769
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4
4870
github.com/stretchr/testify v1.7.0
71+
github.com/supranational/blst v0.3.8-0.20220526154634-513d2456b344
4972
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
5073
github.com/thoas/go-funk v0.9.2
5174
github.com/tklauser/go-sysconf v0.3.5 // indirect
@@ -62,33 +85,10 @@ require (
6285
gopkg.in/urfave/cli.v1 v1.20.0
6386
)
6487

65-
require (
66-
github.com/ipfs/go-block-format v0.0.3
67-
github.com/ipfs/go-cid v0.2.0
68-
github.com/ipfs/go-ipfs-blockstore v1.2.0
69-
github.com/ipfs/go-ipfs-ds-help v1.1.0
70-
github.com/ipfs/go-ipld-format v0.4.0
71-
github.com/jackc/pgconn v1.7.0
72-
github.com/jackc/pgx/v4 v4.8.1
73-
github.com/jackpal/go-nat-pmp v1.0.2
74-
github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b
75-
github.com/jmoiron/sqlx v1.2.0
76-
github.com/julienschmidt/httprouter v1.2.0
77-
github.com/karalabe/usb v0.0.2
78-
github.com/lib/pq v1.4.0
79-
github.com/mattn/go-colorable v0.1.8
80-
github.com/mattn/go-isatty v0.0.12
81-
github.com/multiformats/go-multihash v0.1.0
82-
github.com/naoina/toml v0.1.1
83-
github.com/olekukonko/tablewriter v0.0.5
84-
github.com/prometheus/tsdb v0.10.0
85-
github.com/shirou/gopsutil v3.21.11+incompatible
86-
github.com/supranational/blst v0.3.8
87-
)
88-
8988
require (
9089
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
9190
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect
91+
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
9292
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2 // indirect
9393
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2 // indirect
9494
github.com/aws/aws-sdk-go-v2/service/sso v1.1.1 // indirect
@@ -102,45 +102,40 @@ require (
102102
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
103103
github.com/gogo/protobuf v1.3.1 // indirect
104104
github.com/ipfs/bbloom v0.0.4 // indirect
105-
github.com/ipfs/go-datastore v0.5.0 // indirect
106-
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
105+
github.com/ipfs/go-datastore v0.4.2 // indirect
106+
github.com/ipfs/go-ipfs-util v0.0.1 // indirect
107107
github.com/ipfs/go-log v0.0.1 // indirect
108108
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
109109
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
110110
github.com/jackc/pgio v1.0.0 // indirect
111111
github.com/jackc/pgpassfile v1.0.0 // indirect
112-
github.com/jackc/pgproto3/v2 v2.0.5 // indirect
112+
github.com/jackc/pgproto3/v2 v2.1.1 // indirect
113113
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
114-
github.com/jackc/pgtype v1.4.2 // indirect
115-
github.com/jackc/puddle v1.1.2 // indirect
116-
github.com/jbenet/goprocess v0.1.4 // indirect
117-
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
118-
github.com/kylelemons/godebug v1.1.0 // indirect
114+
github.com/jackc/pgtype v1.8.1 // indirect
115+
github.com/jackc/puddle v1.1.3 // indirect
116+
github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 // indirect
119117
github.com/mattn/go-runewidth v0.0.9 // indirect
120118
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
121-
github.com/minio/sha256-simd v1.0.0 // indirect
119+
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 // indirect
122120
github.com/mitchellh/mapstructure v1.4.1 // indirect
123121
github.com/mitchellh/pointerstructure v1.2.0 // indirect
124-
github.com/mr-tron/base58 v1.2.0 // indirect
122+
github.com/mr-tron/base58 v1.1.3 // indirect
125123
github.com/multiformats/go-base32 v0.0.3 // indirect
126124
github.com/multiformats/go-base36 v0.1.0 // indirect
127125
github.com/multiformats/go-multibase v0.0.3 // indirect
128-
github.com/multiformats/go-varint v0.0.6 // indirect
129-
github.com/naoina/go-stringutil v0.1.0 // indirect
126+
github.com/multiformats/go-varint v0.0.5 // indirect
130127
github.com/opentracing/opentracing-go v1.1.0 // indirect
131128
github.com/pkg/errors v0.9.1 // indirect
132129
github.com/pmezard/go-difflib v1.0.0 // indirect
133130
github.com/spaolacci/murmur3 v1.1.0 // indirect
134131
github.com/stretchr/objx v0.2.0 // indirect
135132
github.com/tklauser/numcpus v0.2.2 // indirect
136133
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect
137-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
138134
go.uber.org/atomic v1.6.0 // indirect
139135
golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
140136
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
141137
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
142138
google.golang.org/protobuf v1.23.0 // indirect
143139
gopkg.in/yaml.v2 v2.4.0 // indirect
144140
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
145-
lukechampine.com/blake3 v1.1.6 // indirect
146141
)

0 commit comments

Comments
 (0)