From 8652cf824bb297c80beb787e5aea8d4eab7c7650 Mon Sep 17 00:00:00 2001 From: Francisco Moura Date: Tue, 27 Aug 2024 18:48:51 -0300 Subject: [PATCH] chore(deps): Remove Devnet 'BlockToWaitForOnStartup' as it is no longer needed --- internal/deps/deps.go | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/internal/deps/deps.go b/internal/deps/deps.go index 628a9d7f0..5dae333b8 100644 --- a/internal/deps/deps.go +++ b/internal/deps/deps.go @@ -20,17 +20,16 @@ import ( ) const ( - DefaultPostgresDatabase = "postgres" - DefaultPostgresDockerImage = "postgres:16-alpine" - DefaultPostgresPort = "5432" - DefaultPostgresUser = "postgres" - DefaultPostgresPassword = "password" - DefaultDevnetDockerImage = "cartesi/rollups-node-devnet:devel" - DefaultDevnetPort = "8545" - DefaultDevnetBlockTime = "1" - DefaultSlotsInAnEpoch = "1" - DefaultDevnetBlockToWaitForOnStartup = "21" - DefaultDevnetNoMining = false + DefaultPostgresDatabase = "postgres" + DefaultPostgresDockerImage = "postgres:16-alpine" + DefaultPostgresPort = "5432" + DefaultPostgresUser = "postgres" + DefaultPostgresPassword = "password" + DefaultDevnetDockerImage = "cartesi/rollups-node-devnet:devel" + DefaultDevnetPort = "8545" + DefaultDevnetBlockTime = "1" + DefaultSlotsInAnEpoch = "1" + DefaultDevnetNoMining = false numPostgresCheckReadyAttempts = 2 pollInterval = 5 * time.Second @@ -63,7 +62,6 @@ type DevnetConfig struct { Port string BlockTime string BlockFinalizationOffset string - BlockToWaitForOnStartup string NoMining bool } @@ -80,7 +78,6 @@ func NewDefaultDepsConfig() *DepsConfig { DefaultDevnetPort, DefaultDevnetBlockTime, DefaultSlotsInAnEpoch, - DefaultDevnetBlockToWaitForOnStartup, DefaultDevnetNoMining, }, } @@ -275,7 +272,7 @@ func Run(ctx context.Context, depsConfig DepsConfig) (*DepsContainers, error) { } else { cmd = append(cmd, "--block-time", depsConfig.Devnet.BlockTime) - waitStrategy = wait.ForLog("Block Number: " + depsConfig.Devnet.BlockToWaitForOnStartup) + waitStrategy = wait.ForLog("Listening on 0.0.0.0:8545") } devNetReq := testcontainers.ContainerRequest{ Image: depsConfig.Devnet.DockerImage,