fix tengateway test

integration/eth2network/build_number.go

@@ -7,6 +7,8 @@ import (
 	"strconv"
 )
 
+// Need this due to character limit on unix path when deploying the geth network on azure and integration tests. We
+// incremenet the build number up to 9999 and then reset to 1, overwriting any existing files.
 func getBuildNumber() (int, error) {
 	buildNumberStr := os.Getenv("BUILD_NUMBER")
 	var buildNumber int

integration/tengateway/tengateway_test.go

@@ -489,7 +489,6 @@ func testErrorHandling(t *testing.T, httpURL, wsURL string, w wallet.Wallet) {
 	require.NoError(t, err)
 
 	// make requests to geth for comparison
-
 	for _, req := range []string{
 		`{"jsonrpc":"2.0","method":"eth_getLogs","params":[[]],"id":1}`,
 		`{"jsonrpc":"2.0","method":"eth_getLogs","params":[{"topics":[]}],"id":1}`,
@@ -511,7 +510,7 @@ func testErrorHandling(t *testing.T, httpURL, wsURL string, w wallet.Wallet) {
 		`{"jsonrpc":"2.0","method":"eth_getTransactionByHash","params":["0x0000000000000000000000000000000000000000000000000000000000000000"],"id":1}`,
 		`{"jsonrpc":"2.0","method":"eth_maxPriorityFeePerGas","params":[],"id":1}`,
 	} {
-		// ensure the geth request is issued correctly (should return 200 ok with jsonRPCError)
+		// ensure the gateway request is issued correctly (should return 200 ok with jsonRPCError)
 		_, response, err := httputil.PostDataJSON(ogClient.HTTP(), []byte(req))
 		require.NoError(t, err)
 		fmt.Printf("Resp: %s", response)
@@ -521,7 +520,7 @@ func testErrorHandling(t *testing.T, httpURL, wsURL string, w wallet.Wallet) {
 		err = json.Unmarshal(response, &jsonRPCError)
 		require.NoError(t, err, req, response)
 
-		// repeat the process for the gateway
+		// repeat the process for geth
 		_, response, err = httputil.PostDataJSON(fmt.Sprintf("http://localhost:%d", _startPort+integration.DefaultGethHTTPPortOffset), []byte(req))
 		require.NoError(t, err)
 

testnet/launcher/l1contractdeployer/docker.go

@@ -76,7 +76,6 @@ func (n *ContractDeployer) RetrieveL1ContractAddresses() (*node.NetworkConfig, e
 	// make sure the container has finished execution (3 minutes allows time for L1 transactions to be mined)
 	err = docker.WaitForContainerToFinish(n.containerID, 3*time.Minute)
 	if err != nil {
-		println("HERE2")
 		return nil, err
 	}
 
@@ -94,7 +93,6 @@ func (n *ContractDeployer) RetrieveL1ContractAddresses() (*node.NetworkConfig, e
 	// Read the container logs
 	out, err := cli.ContainerLogs(context.Background(), n.containerID, logsOptions)
 	if err != nil {
-		println("HERE3")
 		return nil, err
 	}
 	defer out.Close()
@@ -103,7 +101,6 @@ func (n *ContractDeployer) RetrieveL1ContractAddresses() (*node.NetworkConfig, e
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, out)
 	if err != nil {
-		println("HERE4")
 		return nil, err
 	}
 
@@ -120,12 +117,10 @@ func (n *ContractDeployer) RetrieveL1ContractAddresses() (*node.NetworkConfig, e
 
 	managementAddr, err := findAddress(lines[0])
 	if err != nil {
-		println("HERE5")
 		return nil, err
 	}
 	messageBusAddr, err := findAddress(lines[1])
 	if err != nil {
-		println("HERE6")
 		return nil, err
 	}
 	l1BlockHash := readValue("L1Start", lines[2])