From 08982c81fc0c83504df4b4043e7a6e9bb0ba4550 Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Fri, 24 Sep 2021 13:49:06 -0400 Subject: [PATCH 1/3] e2e: skip validation of status apphash (#6991) I believe this assertion is likely redundant given that we're checking the block apphash. --- test/e2e/tests/app_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/e2e/tests/app_test.go b/test/e2e/tests/app_test.go index 4387b98cd..afd4d2d52 100644 --- a/test/e2e/tests/app_test.go +++ b/test/e2e/tests/app_test.go @@ -44,17 +44,15 @@ func TestApp_Hash(t *testing.T) { require.NoError(t, err) require.NotEmpty(t, info.Response.LastBlockAppHash, "expected app to return app hash") - status, err := client.Status(ctx) - require.NoError(t, err) - if info.Response.LastBlockHeight == status.SyncInfo.LatestBlockHeight { - require.EqualValues(t, info.Response.LastBlockAppHash, status.SyncInfo.LatestAppHash, - "app hash does not match node status") - } - block, err := client.Block(ctx, &info.Response.LastBlockHeight) require.NoError(t, err) require.EqualValues(t, info.Response.LastBlockAppHash, block.Block.AppHash.Bytes(), "app hash does not match last block's app hash") + + status, err := client.Status(ctx) + require.NoError(t, err) + require.True(t, status.SyncInfo.LatestBlockHeight >= info.Response.LastBlockHeight, + "status out of sync with application") }) } From 5e45676875b411059fae0e8878dc639001869762 Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Fri, 24 Sep 2021 14:27:00 -0400 Subject: [PATCH 2/3] e2e: do not inject evidence through light proxy (#6992) In the last run, there were two problems at the RPC layer returned from light nodes' RPC end points. I think exercising the light client proxy RPC system is something that can/should be done via unit testing, and that likely these errors are (in production) transient and (in CI) very likely to fail for test environment issues. --- test/e2e/runner/evidence.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/runner/evidence.go b/test/e2e/runner/evidence.go index ab993a2fe..e6c7c3f7a 100644 --- a/test/e2e/runner/evidence.go +++ b/test/e2e/runner/evidence.go @@ -35,7 +35,7 @@ func InjectEvidence(ctx context.Context, testnet *e2e.Testnet, amount int) error for _, idx := range rand.Perm(len(testnet.Nodes)) { targetNode = testnet.Nodes[idx] - if targetNode.Mode == e2e.ModeSeed { + if targetNode.Mode == e2e.ModeSeed || targetNode.Mode == e2e.ModeLight { targetNode = nil continue } From dbad7015155d7ced67ac67b7fd9915b61ca0ebbb Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Fri, 24 Sep 2021 14:59:10 -0400 Subject: [PATCH 3/3] ci: use smart merges (#6993) --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index df570504a..6b08c877f 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -6,7 +6,7 @@ pull_request_rules: actions: merge: method: squash - strict: true + strict: smart+fasttrack commit_message: title+body - name: backport patches to v0.34.x branch conditions: