From 21936e269980da7fcb4a6b9cbe1edea22e1801c8 Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Mon, 24 Oct 2022 14:13:29 +0800
Subject: [PATCH] fix: fix jenkins tests & sender_test.go (#43)

Co-authored-by: colinlyguo <colinlyguo@gmail.com>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
---
 Jenkinsfile                  |  2 ++
 bridge/Makefile              |  3 ---
 bridge/sender/sender_test.go | 14 +++++++-------
 coordinator/Makefile         |  1 -
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d1d665a19..f6270e623 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,8 @@ pipeline {
                 //start to build project
                 sh '''#!/bin/bash
                     export PATH=/home/ubuntu/go/bin:$PATH
+                    docker build -t scroll_l1geth ./common/docker/l1geth/
+                    docker build -t scroll_l2geth ./common/docker/l2geth/
                     make -C bridge mock_abi
                     make -C bridge bridge
                     make -C bridge docker
diff --git a/bridge/Makefile b/bridge/Makefile
index 6c46895f8..ddbfe26b1 100644
--- a/bridge/Makefile
+++ b/bridge/Makefile
@@ -22,9 +22,6 @@ clean: ## Empty out the bin folder
 	@rm -rf build/bin
 
 docker:
-#	docker container prune -f
-#	docker build -t scroll_l1geth ../common/docker/l1geth/
-#	docker build -t scroll_l2geth ../common/docker/l2geth/
 	docker build -t scrolltech/${IMAGE_NAME}:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/bridge.Dockerfile
 
 docker_push:
diff --git a/bridge/sender/sender_test.go b/bridge/sender/sender_test.go
index 799461e6b..bfc6b8ffb 100644
--- a/bridge/sender/sender_test.go
+++ b/bridge/sender/sender_test.go
@@ -54,16 +54,16 @@ func TestFunction(t *testing.T) {
 		assert.NoError(t, err)
 		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
 
-		// create sender
-		sender, err := sender.NewSender(context.Background(), cfg.L2Config.RelayerConfig.SenderConfig, private)
+		// create newSender
+		newSender, err := sender.NewSender(context.Background(), cfg.L2Config.RelayerConfig.SenderConfig, private)
 		assert.NoError(t, err)
-		defer sender.Stop()
+		defer newSender.Stop()
 
 		assert.NoError(t, err)
 
 		// send transactions
 		idCache := cmap.New()
-		confirmCh := sender.ConfirmChan()
+		confirmCh := newSender.ConfirmChan()
 		var (
 			eg    errgroup.Group
 			errCh chan error
@@ -74,7 +74,7 @@ func TestFunction(t *testing.T) {
 				toAddr := common.BigToAddress(big.NewInt(int64(i + 1000)))
 				id := strconv.Itoa(i + 1000)
 				eg.Go(func() error {
-					txHash, err := sender.SendTransaction(id, &toAddr, big.NewInt(1), nil)
+					txHash, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil)
 					if err != nil {
 						t.Error("failed to send tx", "err", err)
 						return err
@@ -88,7 +88,7 @@ func TestFunction(t *testing.T) {
 		}()
 
 		// avoid 10 mins cause testcase panic
-		after := time.After(598 * time.Second)
+		after := time.After(60 * time.Second)
 		for {
 			select {
 			case cmsg := <-confirmCh:
@@ -107,7 +107,7 @@ func TestFunction(t *testing.T) {
 				}
 				assert.NoError(t, err)
 			case <-after:
-				t.Logf("sender test failed because timeout")
+				t.Logf("newSender test failed because timeout")
 				t.FailNow()
 			}
 		}
diff --git a/coordinator/Makefile b/coordinator/Makefile
index 069463227..d2433ad3e 100644
--- a/coordinator/Makefile
+++ b/coordinator/Makefile
@@ -14,7 +14,6 @@ clean: ## Empty out the bin folder
 	@rm -rf build/bin
 
 docker:
-	docker container prune -f
 	docker build -t scrolltech/${IMAGE_NAME}:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/coordinator.Dockerfile
 
 docker_push: