github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-10 22:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix jenkins tests & sender_test.go (#43)

Browse Source 
Co-authored-by: colinlyguo <colinlyguo@gmail.com>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
This commit is contained in:
maskpp
2022-10-24 14:13:29 +08:00
committed by GitHub
parent 0c29819f1d
commit 21936e2699
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -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

3
bridge/Makefile
View File

@@ -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:

14
bridge/sender/sender_test.go
View File

@@ -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()
}
}

1
coordinator/Makefile
View File

@@ -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: