Merge pull request #964 from iotaledger/fix/snapshot-dockertest

Fix snapshot docker tests

pkg/testsuite/mock/blockissuer.go

@@ -94,15 +94,21 @@ func (i *BlockIssuer) Address() iotago.Address {
 func (i *BlockIssuer) CreateValidationBlock(ctx context.Context, alias string, node *Node, opts ...options.Option[ValidationBlockParams]) (*blocks.Block, error) {
 	blockParams := options.Apply(NewValidationBlockParams(), opts)
 
+	blockIssuanceInfo, err := i.Client.BlockIssuance(ctx)
+	require.NoError(i.Testing, err)
+
 	if blockParams.BlockHeader.IssuingTime == nil {
 		issuingTime := time.Now().UTC()
+		if issuingTime.Before(blockIssuanceInfo.LatestParentBlockIssuingTime) {
+			issuingTime = blockIssuanceInfo.LatestParentBlockIssuingTime.Add(time.Nanosecond)
+		}
+
 		blockParams.BlockHeader.IssuingTime = &issuingTime
 	}
 
 	apiForBlock := i.retrieveAPI(blockParams.BlockHeader)
 	protoParams := apiForBlock.ProtocolParameters()
-	blockIssuanceInfo, err := i.Client.BlockIssuance(ctx)
-	require.NoError(i.Testing, err)
+
 	if blockParams.BlockHeader.SlotCommitment == nil {
 		commitment := blockIssuanceInfo.LatestCommitment
 		blockSlot := apiForBlock.TimeProvider().SlotFromTime(*blockParams.BlockHeader.IssuingTime)
@@ -133,7 +139,7 @@ func (i *BlockIssuer) CreateValidationBlock(ctx context.Context, alias string, n
 	}
 
 	if blockParams.BlockHeader.References == nil {
-		blockParams.BlockHeader.References = referencesFromBlockIssuanceResponse(i.latestBlockIssuanceResponse(ctx))
+		blockParams.BlockHeader.References = referencesFromBlockIssuanceResponse(blockIssuanceInfo)
 	}
 
 	err = i.setDefaultBlockParams(ctx, blockParams.BlockHeader)
@@ -244,6 +250,10 @@ func (i *BlockIssuer) CreateBasicBlock(ctx context.Context, alias string, opts .
 	// set the issuing time last to ensure the timestamp is greater than that of the parents selected.
 	if blockParams.BlockHeader.IssuingTime == nil {
 		issuingTime := time.Now().UTC()
+		if issuingTime.Before(blockIssuanceInfo.LatestParentBlockIssuingTime) {
+			issuingTime = blockIssuanceInfo.LatestParentBlockIssuingTime.Add(time.Nanosecond)
+		}
+
 		blockParams.BlockHeader.IssuingTime = &issuingTime
 	}
 	blockBuilder.IssuingTime(*blockParams.BlockHeader.IssuingTime)

tools/docker-network/docker-compose.yml

@@ -202,7 +202,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     stop_grace_period: 1m
-    restart: no
+    restart: unless-stopped
     depends_on:
       node-1-validator:
         condition: service_started
@@ -219,7 +219,7 @@ services:
 
   grafana:
     image: grafana/grafana:9.5.6
-    restart: no
+    restart: unless-stopped
     networks:
       - iota-core
     ports:
@@ -259,7 +259,7 @@ services:
   inx-mqtt:
     image: iotaledger/inx-mqtt:2.0-alpha
     stop_grace_period: 1m
-    restart: no
+    restart: unless-stopped
     depends_on:
       node-1-validator:
         condition: service_healthy
@@ -370,7 +370,7 @@ services:
   inx-validator-4:
     image: iotaledger/inx-validator:1.0-alpha
     stop_grace_period: 1m
-    restart: unless-stopped
+    restart: no
     depends_on:
       node-4-validator:
         condition: service_started

tools/docker-network/tests/accounttransition_test.go

@@ -32,7 +32,7 @@ func Test_AccountTransitions(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)

tools/docker-network/tests/api_management_test.go

@@ -43,13 +43,16 @@ func Test_ManagementAPI_Peers(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	runErr := d.Run()
 	require.NoError(t, runErr)
 
 	d.WaitUntilNetworkReady()
 
+	// wait longer for autopeering
+	d.AwaitCommitment(d.DefaultWallet().CurrentSlot())
+
 	// get the management client
 	managementClient, err := d.Client("V1").Management(getContextWithTimeout(5 * time.Second))
 	require.NoError(t, err)
@@ -132,7 +135,7 @@ func Test_ManagementAPI_Peers_BadRequests(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	runErr := d.Run()
 	require.NoError(t, runErr)
@@ -185,8 +188,8 @@ func Test_ManagementAPI_Peers_BadRequests(t *testing.T) {
 func Test_ManagementAPI_Pruning(t *testing.T) {
 	d := dockertestframework.NewDockerTestFramework(t,
 		dockertestframework.WithProtocolParametersOptions(
-			iotago.WithTimeProviderOptions(0, time.Now().Unix(), 4, 4),
-			iotago.WithLivenessOptions(3, 4, 2, 4, 5),
+			iotago.WithTimeProviderOptions(0, time.Now().Unix(), 10, 3),
+			iotago.WithLivenessOptions(10, 10, 2, 4, 5),
 			iotago.WithCongestionControlOptions(1, 1, 1, 400_000, 250_000, 50_000_000, 1000, 100),
 			iotago.WithRewardsOptions(8, 10, 2, 384),
 			iotago.WithTargetCommitteeSize(4),
@@ -198,7 +201,7 @@ func Test_ManagementAPI_Pruning(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	runErr := d.Run()
 	require.NoError(t, runErr)
@@ -221,9 +224,9 @@ func Test_ManagementAPI_Pruning(t *testing.T) {
 			name: "Test_PruneDatabase_ByEpoch",
 			testFunc: func(t *testing.T) {
 				// we need to wait until epoch 3 to be able to prune epoch 1
-				d.AwaitNextEpoch()
-				d.AwaitNextEpoch()
-				d.AwaitNextEpoch()
+				d.AwaitEpochFinalized()
+				d.AwaitEpochFinalized()
+				d.AwaitEpochFinalized()
 
 				// prune database by epoch
 				pruneDatabaseResponse, err := managementClient.PruneDatabaseByEpoch(getContextWithTimeout(5*time.Second), 1)
@@ -235,7 +238,7 @@ func Test_ManagementAPI_Pruning(t *testing.T) {
 			name: "Test_PruneDatabase_ByDepth",
 			testFunc: func(t *testing.T) {
 				// wait for the next epoch to start
-				d.AwaitNextEpoch()
+				d.AwaitEpochFinalized()
 
 				// prune database by depth
 				pruneDatabaseResponse, err := managementClient.PruneDatabaseByDepth(getContextWithTimeout(5*time.Second), 1)
@@ -247,7 +250,7 @@ func Test_ManagementAPI_Pruning(t *testing.T) {
 			name: "Test_PruneDatabase_BySize",
 			testFunc: func(t *testing.T) {
 				// wait for the next epoch to start
-				d.AwaitNextEpoch()
+				d.AwaitEpochFinalized()
 
 				// prune database by size
 				pruneDatabaseResponse, err := managementClient.PruneDatabaseBySize(getContextWithTimeout(5*time.Second), "5G")
@@ -266,8 +269,8 @@ func Test_ManagementAPI_Pruning(t *testing.T) {
 func Test_ManagementAPI_Snapshots(t *testing.T) {
 	d := dockertestframework.NewDockerTestFramework(t,
 		dockertestframework.WithProtocolParametersOptions(
-			iotago.WithTimeProviderOptions(0, time.Now().Unix(), 3, 4),
-			iotago.WithLivenessOptions(3, 4, 2, 4, 8),
+			iotago.WithTimeProviderOptions(0, time.Now().Unix(), 10, 3),
+			iotago.WithLivenessOptions(10, 10, 2, 4, 5),
 			iotago.WithCongestionControlOptions(1, 1, 1, 400_000, 250_000, 50_000_000, 1000, 100),
 			iotago.WithRewardsOptions(8, 10, 2, 384),
 			iotago.WithTargetCommitteeSize(4),
@@ -278,7 +281,7 @@ func Test_ManagementAPI_Snapshots(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	runErr := d.Run()
 	require.NoError(t, runErr)
@@ -291,16 +294,6 @@ func Test_ManagementAPI_Snapshots(t *testing.T) {
 	managementClient, err := nodeClientV1.Management(getContextWithTimeout(5 * time.Second))
 	require.NoError(t, err)
 
-	awaitNextCommittedEpoch := func() {
-		info, err := nodeClientV1.Info(getContextWithTimeout(5 * time.Second))
-		require.NoError(t, err)
-
-		currentEpoch := nodeClientV1.CommittedAPI().TimeProvider().EpochFromSlot(info.Status.LatestCommitmentID.Slot())
-
-		// await the start slot of the next epoch
-		d.AwaitCommitment(nodeClientV1.CommittedAPI().TimeProvider().EpochStart(currentEpoch + 1))
-	}
-
 	type test struct {
 		name     string
 		testFunc func(t *testing.T)
@@ -311,7 +304,7 @@ func Test_ManagementAPI_Snapshots(t *testing.T) {
 			name: "Test_CreateSnapshot",
 			testFunc: func(t *testing.T) {
 				// wait for the next epoch to start
-				awaitNextCommittedEpoch()
+				d.AwaitEpochFinalized()
 
 				// create snapshot
 				snapshotResponse, err := managementClient.CreateSnapshot(getContextWithTimeout(5 * time.Second))

tools/docker-network/tests/committeerotation_test.go

@@ -36,7 +36,7 @@ func Test_SmallerCommittee(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)
@@ -81,7 +81,7 @@ func Test_ReuseDueToNoFinalization(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)
@@ -150,7 +150,7 @@ func Test_NoCandidacyPayload(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl", false)
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt", false)
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw", false)
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)
@@ -200,7 +200,7 @@ func Test_Staking(t *testing.T) {
 	d.AddValidatorNode("V2", "docker-network-inx-validator-2-1", "http://localhost:8060", "rms1pqm4xk8e9ny5w5rxjkvtp249tfhlwvcshyr3pc0665jvp7g3hc875k538hl")
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)
@@ -247,7 +247,7 @@ func Test_Delegation(t *testing.T) {
 	d.AddValidatorNode("V3", "docker-network-inx-validator-3-1", "http://localhost:8070", "rms1pp4wuuz0y42caz48vv876qfpmffswsvg40zz8v79sy8cp0jfxm4kunflcgt")
 	// V4 pubKey in hex: 0xc9ceac37d293155a578381aa313ee74edfa3ac73ee930d045564aae7771e8ffe
 	d.AddValidatorNode("V4", "docker-network-inx-validator-4-1", "http://localhost:8040", "rms1pr8cxs3dzu9xh4cduff4dd4cxdthpjkpwmz2244f75m0urslrsvtsshrrjw")
-	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8090")
+	d.AddNode("node5", "docker-network-node-5-1", "http://localhost:8080")
 
 	err := d.Run()
 	require.NoError(t, err)

tools/docker-network/tests/dockertestframework/asserts.go

@@ -76,7 +76,6 @@ func (d *DockerTestFramework) AssertCommittee(expectedEpoch iotago.EpochIndex, e
 	status := d.NodeStatus("V1")
 	testAPI := d.defaultWallet.Client.CommittedAPI()
 	expectedSlotStart := testAPI.TimeProvider().EpochStart(expectedEpoch)
-	require.Greater(d.Testing, expectedSlotStart, status.LatestAcceptedBlockSlot)
 
 	if status.LatestAcceptedBlockSlot < expectedSlotStart {
 		slotToWait := expectedSlotStart - status.LatestAcceptedBlockSlot
@@ -87,22 +86,22 @@ func (d *DockerTestFramework) AssertCommittee(expectedEpoch iotago.EpochIndex, e
 
 	d.Eventually(func() error {
 		for _, node := range d.Nodes() {
-			resp, err := d.Client(node.Name).Committee(context.TODO())
+			resp, err := d.Client(node.Name).Committee(context.TODO(), expectedEpoch)
 			if err != nil {
 				return err
 			}
 
-			if resp.Epoch == expectedEpoch {
-				members := make([]string, len(resp.Committee))
-				for i, member := range resp.Committee {
-					members[i] = member.AddressBech32
-				}
+			if resp.Epoch != expectedEpoch {
+				return ierrors.Errorf("expected epoch %d, but got %d", expectedEpoch, resp.Epoch)
+			}
 
-				sort.Strings(members)
-				if match := lo.Equal(expectedCommitteeMember, members); match {
-					return nil
-				}
+			members := make([]string, len(resp.Committee))
+			for i, member := range resp.Committee {
+				members[i] = member.AddressBech32
+			}
 
+			sort.Strings(members)
+			if !lo.Equal(expectedCommitteeMember, members) {
 				return ierrors.Errorf("committee members does not match as expected, expected: %v, actual: %v", expectedCommitteeMember, members)
 			}
 		}

tools/docker-network/tests/dockertestframework/awaits.go

@@ -63,9 +63,9 @@ func (d *DockerTestFramework) AwaitTransactionFailure(ctx context.Context, txID
 
 		if expectedReason == resp.TransactionFailureReason {
 			return nil
-		} else {
-			return ierrors.Errorf("expected transaction %s to have failure reason '%s', got '%s' instead, failure details: %s", txID, expectedReason, resp.TransactionFailureReason, resp.TransactionFailureDetails)
 		}
+
+		return ierrors.Errorf("expected transaction %s to have failure reason '%s', got '%s' instead, failure details: %s", txID, expectedReason, resp.TransactionFailureReason, resp.TransactionFailureDetails)
 	})
 }
 
@@ -92,17 +92,28 @@ func (d *DockerTestFramework) AwaitCommitment(targetSlot iotago.SlotIndex) {
 }
 
 func (d *DockerTestFramework) AwaitFinalization(targetSlot iotago.SlotIndex) {
-	d.Eventually(func() error {
+	currentFinalizedSlot := d.NodeStatus("V1").LatestFinalizedSlot
+
+	// we wait at max "targetSlot - currentFinalizedSlot" times * slot duration
+	deadline := time.Duration(d.defaultWallet.Client.CommittedAPI().ProtocolParameters().SlotDurationInSeconds()) * time.Second
+	if currentFinalizedSlot < targetSlot {
+		deadline *= time.Duration(targetSlot - currentFinalizedSlot)
+	}
+
+	// give some extra time for peering etc
+	deadline += 30 * time.Second
+
+	d.EventuallyWithDurations(func() error {
 		currentFinalisedSlot := d.NodeStatus("V1").LatestFinalizedSlot
 		if targetSlot > currentFinalisedSlot {
 			return ierrors.Errorf("finalized slot %d is not reached yet", targetSlot)
 		}
 
 		return nil
-	})
+	}, deadline, 1*time.Second)
 }
 
-func (d *DockerTestFramework) AwaitNextEpoch() {
+func (d *DockerTestFramework) AwaitEpochFinalized() {
 	//nolint:lostcancel
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 

tools/docker-network/tests/dockertestframework/framework.go

@@ -130,11 +130,15 @@ func (d *DockerTestFramework) DockerComposeUp(detach ...bool) error {
 }
 
 func (d *DockerTestFramework) Run() error {
+	// first we remove old containers, volumes and orphans
+	_ = exec.Command("docker", "compose", "down", "-v", "--remove-orphans").Run()
+
 	ch := make(chan error)
 	stopCh := make(chan struct{})
 	defer close(ch)
 	defer close(stopCh)
 
+	ts := time.Now()
 	go func() {
 		err := d.DockerComposeUp()
 
@@ -165,7 +169,7 @@ loop:
 			}
 		case <-ticker.C:
 			fmt.Println("Waiting for nodes to become available...")
-			if d.waitForNodesAndGetClients() == nil {
+			if d.waitForNodesOnlineAndInitClients(ts) == nil {
 				break loop
 			}
 		}
@@ -183,7 +187,8 @@ func (d *DockerTestFramework) Stop() {
 	fmt.Println("Stop the network...")
 	defer fmt.Println("Stop the network.....done")
 
-	_ = exec.Command("docker", "compose", "down").Run()
+	// remove volumes and orphans
+	_ = exec.Command("docker", "compose", "down", "-v", "--remove-orphans").Run()
 	_ = exec.Command("rm", d.snapshotPath).Run() //nolint:gosec
 }
 
@@ -242,12 +247,10 @@ func (d *DockerTestFramework) DumpContainerLog(name string, optLogNameExtension
 
 func (d *DockerTestFramework) GetContainersConfigs() {
 	// get container configs
-	nodes := d.Nodes()
-
 	d.nodesLock.Lock()
 	defer d.nodesLock.Unlock()
 
-	for _, node := range nodes {
+	for _, node := range d.nodesWithoutLocking() {
 		cmd := fmt.Sprintf("docker inspect --format='{{.Config.Cmd}}' %s", node.ContainerName)
 		containerConfigsBytes, err := exec.Command("bash", "-c", cmd).Output()
 		require.NoError(d.Testing, err)
@@ -266,6 +269,7 @@ func (d *DockerTestFramework) GetContainersConfigs() {
 
 		node.ContainerConfigs = configs
 		node.PrivateKey = envs
+
 		d.nodes[node.Name] = node
 	}
 }