diff options
| author | Gary <982483+gmalouf@users.noreply.github.com> | 2024-01-23 12:09:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 12:09:00 -0500 |
| commit | 2e0644cd477f041dac7458e07f89dc37e626cb97 (patch) | |
| tree | d22524c9ec05cbc95d337bd94be5e7e66aea5f36 | |
| parent | 135a1b4f0dd24c9fb9298b83170600e6657eee86 (diff) | |
Tests: Adjust catchup e2e tests for non-archival relays (#5917)
| -rw-r--r-- | netdeploy/networkTemplate.go | 3 | ||||
| -rw-r--r-- | test/e2e-go/features/catchup/catchpointCatchup_test.go | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/netdeploy/networkTemplate.go b/netdeploy/networkTemplate.go index ec3db61eb..d8c30d66e 100644 --- a/netdeploy/networkTemplate.go +++ b/netdeploy/networkTemplate.go @@ -321,6 +321,9 @@ func createConfigFile(node remote.NodeConfigGoal, configFile string, numNodes in if node.IsRelay { // Have relays listen on any localhost port cfg.NetAddress = "127.0.0.1:0" + + cfg.Archival = false // make it explicit non-archival + cfg.MaxBlockHistoryLookback = 20000 // to save blocks beyond MaxTxnLife=13 } else { // Non-relays should not open incoming connections cfg.IncomingConnectionsLimit = 0 diff --git a/test/e2e-go/features/catchup/catchpointCatchup_test.go b/test/e2e-go/features/catchup/catchpointCatchup_test.go index 6bc07e6ca..7d731e9e9 100644 --- a/test/e2e-go/features/catchup/catchpointCatchup_test.go +++ b/test/e2e-go/features/catchup/catchpointCatchup_test.go @@ -126,6 +126,10 @@ func configureCatchpointGeneration(a *require.Assertions, nodeController *nodeco a.NoError(err) cfg.CatchpointInterval = basicTestCatchpointInterval + cfg.Archival = false // make it explicit non-archival + cfg.MaxBlockHistoryLookback = 20000 // to save blocks beyond MaxTxnLife=13 + cfg.CatchpointTracking = 2 // to enable catchpoints on non-archival nodes + cfg.CatchpointFileHistoryLength = 30 // to store more than 2 default catchpoints cfg.MaxAcctLookback = 2 err = cfg.SaveToDisk(nodeController.GetDataDir()) a.NoError(err) @@ -383,7 +387,6 @@ func TestCatchpointLabelGeneration(t *testing.T) { expectLabels bool }{ {4, true, true}, - {4, false, true}, {0, true, false}, } @@ -506,8 +509,11 @@ func TestNodeTxHandlerRestart(t *testing.T) { a.NoError(err) const catchpointInterval = 16 cfg.CatchpointInterval = catchpointInterval - cfg.CatchpointTracking = 2 - cfg.TxSyncIntervalSeconds = 200000 // disable txSync + cfg.Archival = false // make it explicit non-archival + cfg.MaxBlockHistoryLookback = 20000 // to save blocks beyond MaxTxnLife=13 + cfg.CatchpointTracking = 2 // to enable catchpoints on non-archival nodes + cfg.CatchpointFileHistoryLength = 30 // to store more than 2 default catchpoints + cfg.TxSyncIntervalSeconds = 200000 // disable txSync cfg.SaveToDisk(relayNode.GetDataDir()) fixture.Start() @@ -612,8 +618,11 @@ func TestReadyEndpoint(t *testing.T) { a.NoError(err) const catchpointInterval = 16 cfg.CatchpointInterval = catchpointInterval - cfg.CatchpointTracking = 2 - cfg.TxSyncIntervalSeconds = 200000 // disable txSync + cfg.Archival = false // make it explicit non-archival + cfg.MaxBlockHistoryLookback = 20000 // to save blocks beyond MaxTxnLife=13 + cfg.CatchpointTracking = 2 // to enable catchpoints on non-archival nodes + cfg.CatchpointFileHistoryLength = 30 // to store more than 2 default catchpoints + cfg.TxSyncIntervalSeconds = 200000 // disable txSync cfg.SaveToDisk(relayNode.GetDataDir()) fixture.Start() |