Fix merge conflict

peterargue · peterargue · commit 2f89541cf119 · 2023-04-10T16:08:05.000-07:00
diff --git a/integration/localnet/builder/bootstrap.go b/integration/localnet/builder/bootstrap.go
@@ -424,7 +424,7 @@ func prepareAccessService(container testnet.ContainerConfig, i int, n int) Servi
 		"--log-tx-time-to-finalized-executed",
 		"--execution-data-sync-enabled=true",
 		"--execution-data-dir=/data/execution-data",
-		fmt.Sprintf("--state-stream-addr=%s:%d", container.ContainerName, ExecutionStateAPIPort),
+		fmt.Sprintf("--state-stream-addr=%s:%s", container.ContainerName, testnet.ExecutionStatePort),
 	)
 
 	service.AddExposedPorts(

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ func prepareAccessService(container testnet.ContainerConfig, i int, n int) Servi`
`424`	`424`	`"--log-tx-time-to-finalized-executed",`
`425`	`425`	`"--execution-data-sync-enabled=true",`
`426`	`426`	`"--execution-data-dir=/data/execution-data",`
`427`		`- fmt.Sprintf("--state-stream-addr=%s:%d", container.ContainerName, ExecutionStateAPIPort),`
	`427`	`+ fmt.Sprintf("--state-stream-addr=%s:%s", container.ContainerName, testnet.ExecutionStatePort),`
`428`	`428`	`)`
`429`	`429`
`430`	`430`	`service.AddExposedPorts(`