diff --git a/Makefile b/Makefile index 93045ce9eb..9acab6432f 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,8 @@ update: ## update dependencies goimports -local $(PWD)/tests/integration-test/ -w . dev_docker: ## build docker images for development/testing usages - docker build -t scroll_l1geth ./common/docker/l1geth/ - docker build -t scroll_l2geth ./common/docker/l2geth/ + docker build --platform linux/amd64 -t scroll_l1geth ./common/docker/l1geth/ + docker build --platform linux/amd64 -t scroll_l2geth ./common/docker/l2geth/ build_test_docker: ## build Docker image for local testing on M1/M2 Silicon Mac docker build -t scroll_test_image -f ./build/dockerfiles/local_testing.Dockerfile $$(mktemp -d) diff --git a/bridge/internal/controller/relayer/relayer_test.go b/bridge/internal/controller/relayer/relayer_test.go index 152958c3c1..f0fe7e9512 100644 --- a/bridge/internal/controller/relayer/relayer_test.go +++ b/bridge/internal/controller/relayer/relayer_test.go @@ -86,6 +86,10 @@ func TestMain(m *testing.M) { func TestFunctions(t *testing.T) { setupEnv(t) + srv, err := mockChainMonitorServer(cfg.L2Config.RelayerConfig.ChainMonitor.BaseURL) + assert.NoError(t, err) + defer srv.Close() + // Run l1 relayer test cases. t.Run("TestCreateNewL1Relayer", testCreateNewL1Relayer) t.Run("TestL1RelayerProcessSaveEvents", testL1RelayerProcessSaveEvents) diff --git a/prover-stats-api/go.mod b/prover-stats-api/go.mod index c100fae169..051613ce3c 100644 --- a/prover-stats-api/go.mod +++ b/prover-stats-api/go.mod @@ -5,6 +5,7 @@ go 1.19 require ( github.com/appleboy/gin-jwt/v2 v2.9.1 github.com/gin-gonic/gin v1.9.1 + github.com/google/uuid v1.1.5 github.com/stretchr/testify v1.8.3 gorm.io/gorm v1.25.2 ) diff --git a/prover-stats-api/go.sum b/prover-stats-api/go.sum index a3b505dec0..354e4d46df 100644 --- a/prover-stats-api/go.sum +++ b/prover-stats-api/go.sum @@ -64,6 +64,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I= +github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=