From f01dd5d1b72f9370d4f4102e2b0edccdae31d7d7 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 20 Dec 2021 12:30:33 -0600 Subject: [PATCH 1/3] bump statediff meta version; use db v0.3.0 in compose --- docker-compose.yml | 4 ++-- params/version.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f1a37ddcb..d305d1dc1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.2' services: ipld-eth-db: restart: always - image: vulcanize/ipld-eth-db:v0.2.0 + image: vulcanize/ipld-eth-db:v0.3.1 environment: POSTGRES_USER: "vdbm" POSTGRES_DB: "vulcanize_public" @@ -14,4 +14,4 @@ services: - "127.0.0.1:5432:5432" volumes: - geth_node: \ No newline at end of file + geth_node: diff --git a/params/version.go b/params/version.go index 367fbf8a3..77dfbf312 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 10 // Minor version component of the current release - VersionPatch = 11 // Patch version component of the current release - VersionMeta = "statediff-0.0.27" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 10 // Minor version component of the current release + VersionPatch = 11 // Patch version component of the current release + VersionMeta = "statediff-0.1.0" // Version metadata to append to the version string ) // Version holds the textual version string. -- 2.45.2 From ec421c810b57d739c1a9ac6f3f8271550b2dd663 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 20 Dec 2021 13:19:57 -0600 Subject: [PATCH 2/3] skip file writing tests in CI, for now --- statediff/indexer/database/file/mainnet_tests/indexer_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/statediff/indexer/database/file/mainnet_tests/indexer_test.go b/statediff/indexer/database/file/mainnet_tests/indexer_test.go index b721ff05e..b297b82d1 100644 --- a/statediff/indexer/database/file/mainnet_tests/indexer_test.go +++ b/statediff/indexer/database/file/mainnet_tests/indexer_test.go @@ -46,6 +46,10 @@ func init() { fmt.Println("Skipping statediff test") os.Exit(0) } + if os.Getenv("STATEDIFF_DB") != "file" { + fmt.Println("Skipping statediff .sql file writing mode test") + os.Exit(0) + } } func TestPushBlockAndState(t *testing.T) { -- 2.45.2 From de6fb0e15538a8bf435f9e01801270afecab59f1 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 20 Dec 2021 13:43:30 -0600 Subject: [PATCH 3/3] prevent parallel execution of tests in different pkgs (suspect this is what causes our deadlock to show up only in CI test env) --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92413dda7..6a366b86c 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,11 @@ ios: .PHONY: statedifftest statedifftest: | $(GOOSE) - MODE=statediff go test ./statediff/... -v + MODE=statediff go test -p 1 ./statediff/... -v + +.PHONY: statediff_filewriting_test +statediff_filetest: | $(GOOSE) + MODE=statediff STATEDIFF_DB=file go test -p 1 ./statediff/... -v test: all $(GORUN) build/ci.go test -- 2.45.2