From 92595789b818d4a3139e5e221876ee7efb960f4b Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 15:30:22 -0700 Subject: [PATCH 1/7] e2e/edenfast: fix postgres url --- tests/e2e_regression/edenfast/e2e_config_1.yml | 4 ++-- tests/e2e_regression/edenfast/e2e_config_2.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e_regression/edenfast/e2e_config_1.yml b/tests/e2e_regression/edenfast/e2e_config_1.yml index 36b1430d6..a95ae77e1 100644 --- a/tests/e2e_regression/edenfast/e2e_config_1.yml +++ b/tests/e2e_regression/edenfast/e2e_config_1.yml @@ -41,7 +41,7 @@ analysis: # Also, sapphire does not use much code that is not covered by emerald. storage: backend: postgres - endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable + endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable DANGER__WIPE_STORAGE_ON_STARTUP: true migrations: file://storage/migrations @@ -49,7 +49,7 @@ server: chain_name: mainnet endpoint: localhost:8008 storage: - endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable + endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable backend: postgres log: diff --git a/tests/e2e_regression/edenfast/e2e_config_2.yml b/tests/e2e_regression/edenfast/e2e_config_2.yml index 3ca352595..78e7a65aa 100644 --- a/tests/e2e_regression/edenfast/e2e_config_2.yml +++ b/tests/e2e_regression/edenfast/e2e_config_2.yml @@ -26,7 +26,7 @@ analysis: # aggregate_stats: {} # Awkward to make stop after a single run. storage: backend: postgres - endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable + endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable # DANGER__WIPE_STORAGE_ON_STARTUP: true migrations: file://storage/migrations From ba7eaa6e9e53780ddd562b75cb52a5d910998355 Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 16:20:15 -0700 Subject: [PATCH 2/7] e2e: eden: reindex caches --- .../eden/rpc-cache/consensus/db.pmt | Bin 555 -> 555 bytes .../eden/rpc-cache/consensus/main.pix | 2 +- .../eden/rpc-cache/consensus/overflow.pix | 4 ++-- .../eden/rpc-cache/emerald/00000-1.psg | 4 ++-- .../eden/rpc-cache/emerald/00000-1.psg.pmt | Bin 621 -> 621 bytes .../eden/rpc-cache/emerald/db.pmt | Bin 555 -> 555 bytes .../eden/rpc-cache/emerald/index.pmt | Bin 682 -> 697 bytes .../eden/rpc-cache/emerald/main.pix | 4 ++-- .../eden/rpc-cache/emerald/overflow.pix | 4 ++-- .../https_sourcify_dev_server/main.pix | 2 +- .../https_sourcify_dev_server/overflow.pix | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt index 0d5ef3de6c4f11c7087d9894f3720f2456c0da87..0e27eaf68e75b720c9901f885d3bf54eb90fca5e 100644 GIT binary patch delta 13 UcmZ3@vYKUs8WZa||BGx403W&pFaQ7m delta 13 UcmZ3@vYKUs8WZaU(flI}03R|0Q~&?~ diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix index 9252c1927..51fe2465b 100644 --- a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix +++ b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7b55bd89a67f4c93b457561e85cf82c2dead82c7d0e2a04bf5177692cbe3a7b +oid sha256:053fca3122c8ff712983aed925e6e8c0baa5b4d17c4baaa1339dd60127be58d4 size 331264 diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix index 523119f29..363fc6aaa 100644 --- a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix +++ b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5be8ce89424d89a7b962ccca55cd6d238aaaa2f9e3d995257a3c7f00cafb317 -size 37376 +oid sha256:5295ba61fdad32e016cf1ae783961942de1e6f9479e5ade3fcfcfa5055bf3ce4 +size 38912 diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg b/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg index 053bc79d9..5bb4bb3f7 100644 --- a/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg +++ b/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ce2040aa145a633509922be82c3873a241b71ab6a565910faa7acc8140dbe31 -size 1929601 +oid sha256:e9975ad9cfc3b3b7f0d41c0198d04d26ae817a08d5e91e46e5a2f4072ae42113 +size 1935753 diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg.pmt index af2e774650467721b25e934966cbb5ca3f741397..b933f54fda528efdc141b35740d28635c0b9b0fd 100644 GIT binary patch delta 11 ScmaFM@|I;o785hCI0FD0jsqqD delta 11 ScmaFM@|I;o785hieg*&=+XKx2 diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/db.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/db.pmt index 4f19e2000a637fad73828034ed51693aeb8683de..e8e49eab86ffe59780572eae68937fcdf93f34c0 100644 GIT binary patch delta 13 UcmZ3@vYKUs8WZdOCpoqZ03iYdhyVZp delta 13 UcmZ3@vYKUs8WXGE#@}}s03hrI5&!@I diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/index.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/index.pmt index 4396e42c6b4cda515796225934f7a5d58607e8f9..e0703ec663823599801aa823ca704770af00099c 100644 GIT binary patch delta 64 zcmV~$Ar3$Q7=Y35H%6e@1Vs=8ogfH;YuVhw4J6g&KHj^tH+zm`p1w2kuxjGFqK(P| T2TXCn8AmK}!yZ@caK{>c*) Date: Fri, 21 Jun 2024 16:33:47 -0700 Subject: [PATCH 3/7] e2e: run.sh: Print name of suite that passed --- tests/e2e_regression/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e_regression/run.sh b/tests/e2e_regression/run.sh index 1bfbad2a5..a42aa7a50 100755 --- a/tests/e2e_regression/run.sh +++ b/tests/e2e_regression/run.sh @@ -148,4 +148,4 @@ diff --recursive "$TEST_DIR/expected" "$outDir" >/dev/null || { } echo -echo "E2E regression tests passed!" +echo "E2E regression test suite \"$suite\" passed!" From af6cc30537d8b554b6cc072ec7119da910953af2 Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 16:36:37 -0700 Subject: [PATCH 4/7] e2e: damask, edenfast: reindex caches --- .../damask/rpc-cache/consensus/db.pmt | Bin 555 -> 555 bytes .../damask/rpc-cache/consensus/main.pix | 2 +- .../damask/rpc-cache/consensus/overflow.pix | 4 ++-- .../damask/rpc-cache/emerald/db.pmt | Bin 555 -> 555 bytes .../https_sourcify_dev_server/main.pix | 2 +- .../edenfast/rpc-cache/consensus/db.pmt | Bin 555 -> 555 bytes .../edenfast/rpc-cache/consensus/index.pmt | Bin 821 -> 792 bytes .../edenfast/rpc-cache/consensus/main.pix | 2 +- .../edenfast/rpc-cache/consensus/overflow.pix | 4 ++-- .../edenfast/rpc-cache/emerald/00000-1.psg | 4 ++-- .../edenfast/rpc-cache/emerald/00000-1.psg.pmt | Bin 621 -> 621 bytes .../edenfast/rpc-cache/emerald/db.pmt | Bin 555 -> 555 bytes .../edenfast/rpc-cache/emerald/index.pmt | Bin 676 -> 670 bytes .../edenfast/rpc-cache/emerald/main.pix | 4 ++-- .../edenfast/rpc-cache/emerald/overflow.pix | 4 ++-- .../https_sourcify_dev_server/main.pix | 2 +- .../https_sourcify_dev_server/overflow.pix | 4 ++-- 17 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt index e0f672db47b9cf54e26236143dc5356499f3c0b5..fac9c521eddd375fd02966ed460758a6fcd50ec7 100644 GIT binary patch delta 13 UcmZ3@vYKUs8WXEb;%89?038ei!2kdN delta 13 UcmZ3@vYKUs8WU?uu=^1P03DVC{r~^~ diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix index f6f84fbb1..b2743023a 100644 --- a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix +++ b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afc1558c5a7a69359999e13c288083ff4b5f2e390dc5c58ae837f46aaef1582a +oid sha256:4dfd2784b3701429d63267ccece62a9f7009e3f2f7efb414dd0bcfc5a35965cb size 331264 diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix index bb3b4398c..a9a3083ad 100644 --- a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix +++ b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f3cb90fc341e05c69a819b1b6c188644ed08a417fb4d7df13dd0031995fea0 -size 43008 +oid sha256:ac3a2482791b89f9f910bfeed3e10a27be46e71d0f4cd256db1f54f4ef3ba38a +size 45568 diff --git a/tests/e2e_regression/damask/rpc-cache/emerald/db.pmt b/tests/e2e_regression/damask/rpc-cache/emerald/db.pmt index 29aa4e42c8f625c8a84a9ebcd9293e42bc6cd254..310c8bb04f8947a9041f780c33b0af241ed154c6 100644 GIT binary patch delta 13 UcmZ3@vYKUs8WZagzkgv203fRbq5uE@ delta 13 UcmZ3@vYKUs8WZdM(?UlW03ZGYd;kCd diff --git a/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix b/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix index 67297ad3c..c90f818b4 100644 --- a/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix +++ b/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e498979f179740a81071a60da36378a928f036990540ef9c8490638ae5968bd8 +oid sha256:95280502ff44fe4971860f8dc46807adae4697f513dee9ec8828436ad733c70e size 2560 diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt index 77d910929f0d2af8bb04b1175651a921ab9b32b8..26d7801adcdbe6bb4aded90bfb171941f4096e2e 100644 GIT binary patch delta 13 UcmZ3@vYKUs8WStW7m?)*03CY+^8f$< delta 13 UcmZ3@vYKUs8WXEs$)R%$03P84egFUf diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt index 87aa7140ad28c10e5e92a981129ac425d6054feb..c4cd102de2ff31bac382230c86a00cde92cd1a7b 100644 GIT binary patch delta 159 zcmWNHq0Rwt97WIH%-FtYQv}h>Ob|pt5CuW-7^01t2N2jiz!wBTu?eCF@Bo6D-~mJq zzuj=p?mdUxCbyqwrt9w_6_Sm6GE++tdsxRV7V!^Xc)>HSaKI8~fu!%cd;y8|Q nkN6HMV-`F3#1YHbgfoL=s2yATZ3tRw!iy$zjn}I+y z7>oo0BM}G$g8`1d;n{i4-apgIdu2W<4Hth!x=1#6$x@#3)OLUq%s8hjEbxeBY~dd7 z@f3p$`&h?iNZ<)O_z@DDGpykwK7`+3HE@k+A!~!0=Cp;a>m)0|4o$3=;qV delta 43 zcmbQox`cH@Ba^by{}x7e#(zBf8UIgb6lY}n=fUt#fZ?AB!#^2@e+CTyI2afJO^FVq diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix b/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix index aebf64d88..de610dfb6 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c65251fc9c486946128f0e339d4870940eb0cf8f4cb6b93431d0365051744b8 -size 77824 +oid sha256:79a05b57b9df3ca889f5fd713bd3fd333c0a9e62e1250298bd5b5ab47c136b6b +size 79872 diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix index c45300150..b5a4b2729 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d78eba212fec0ea3d7158026f668100cb9f968aa2742ca832484978a915370a -size 9728 +oid sha256:b4e088c7caa9d3b0c45ec32522b6064085ff58c969ecdeeba51e9161bf6b7197 +size 10752 diff --git a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix index 328837023..2cdc9e648 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98a17d24a7a73a3e92c385057eb045612a3558f597887a7a29d6222a07d2f6bc +oid sha256:7a318286926fb14df7f5d6bee12d43b64cbf1f2b2d0ad8b9a9d5a5f29d2bb7db size 2560 diff --git a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix index 8833e9889..4c89e6048 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f50fac4d9ac89ecc22d8a39769fabf88332d09a16e5d4d805eaa23a30c50e64 -size 512 +oid sha256:83dafe291b61c301e557217834e1d958245bd32ca1a08f36dfe31651f5b25c00 +size 1024 From 6db627c0f9a1b7b872010a05a7cc19a0d6eaefbc Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 17:11:19 -0700 Subject: [PATCH 5/7] Add changelog fragment --- .changelog/715.trivial.1.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .changelog/715.trivial.1.md diff --git a/.changelog/715.trivial.1.md b/.changelog/715.trivial.1.md new file mode 100644 index 000000000..e69de29bb From f840d79e66d77dc6c2cdb70b1034d123f32be004 Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 17:18:58 -0700 Subject: [PATCH 6/7] ci: do not use sourcify --- .github/workflows/ci-test.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 6b0a5f190..5dd7002cd 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -160,6 +160,12 @@ jobs: - name: Start db run: | make postgres + - name: Block access to Sourcify + # Sourcify should not need to be available in CI; we run everything from caches. + # Enforce unavailability to keep tests confidently reproducible, and to catch + # any bugs that might cause CI to accidentally use Sourcify. + run: | + sudo bash -c 'echo 0.0.0.0 sourcify.dev | tee -a /etc/hosts' - name: Run e2e regression tests run : | make E2E_REGRESSION_SUITES=${{ matrix.suite }} test-e2e-regression From d297f45ad66c8dd11569842ab92924f41ae4e5e2 Mon Sep 17 00:00:00 2001 From: Mitja T Date: Fri, 21 Jun 2024 22:29:20 -0700 Subject: [PATCH 7/7] cmd/analyzers: comment: Clarify analyzer sequencing --- cmd/analyzer/analyzer.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/analyzer/analyzer.go b/cmd/analyzer/analyzer.go index 2f8844796..edf1a3062 100644 --- a/cmd/analyzer/analyzer.go +++ b/cmd/analyzer/analyzer.go @@ -682,7 +682,8 @@ func (a *Service) Start() { }(an) } - // Prepare slow-sync analyzers (to be started after fast-sync analyzers are done). + // Prepare non-fast-sync analyzers (= item analyzers, slow-sync block analyzers); + // they will be started after fast-sync analyzers are done. var slowSyncWg sync.WaitGroup for _, an := range a.analyzers { slowSyncWg.Add(1)