Skip to content

Commit 4cb4927

Browse files
colinlyguocolinlyguo
committed
fix: fix CI, go mod tidy -compat=1.7 in CI roller.yml
1 parent d6692f5 commit 4cb4927

File tree

13 files changed

+293
-69
lines changed

13 files changed

+293
-69
lines changed

‎.github/workflows/roller.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Install goimports
8080
run: go get golang.org/x/tools/cmd/goimports
8181
- run: goimports -local scroll-tech/go-roller/ -w .
82-
- run: go mod tidy
82+
- run: go mod tidy -compat=1.17
8383
# If there are any diffs from goimports or go mod tidy, fail.
8484
- name: Verify no changes from goimports and go mod tidy
8585
run: |

‎bridge/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Bridge
22

3-
[![Actions Status](https://github.com/scroll-tech/bridge/workflows/Continuous%20Integration/badge.svg)](https://github.com/scroll-tech/bridge/actions)
3+
[![Actions Status](https://scroll-tech/bridge/workflows/Continuous%20Integration/badge.svg)](https://scroll-tech/bridge/actions)
44
[![codecov](https://codecov.io/gh/scroll-tech/bridge/branch/master/graph/badge.svg)](https://codecov.io/gh/scroll-tech/bridge)
55

66
This repo contains the Scroll bridge.

‎bridge/cmd/bridge/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func action(ctx *cli.Context) error {
122122
l1Backend *l1.Backend
123123
l2Backend *l2.Backend
124124
)
125-
// @todo change nil to actual client after https://github.com/scroll-tech/bridge/pull/40 merged
125+
// @todo change nil to actual client after https://scroll-tech/bridge/pull/40 merged
126126
l1Backend, err = l1.New(ctx.Context, cfg.L1Config, ormFactory)
127127
if err != nil {
128128
return err

‎bridge/go.mod‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.17
44

55
require (
66
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
7-
github.com/stretchr/testify v1.7.2
8-
github.com/urfave/cli/v2 v2.3.0
9-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
107
scroll-tech/internal v1.0.0
118
scroll-tech/store v1.0.0
129
scroll-tech/utils v1.0.0
10+
github.com/stretchr/testify v1.7.2
11+
github.com/urfave/cli/v2 v2.3.0
12+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
1313
)
1414

1515
replace (
@@ -60,7 +60,6 @@ require (
6060
github.com/mattn/go-runewidth v0.0.9 // indirect
6161
github.com/mitchellh/mapstructure v1.5.0 // indirect
6262
github.com/mitchellh/pointerstructure v1.2.0 // indirect
63-
github.com/nxadm/tail v1.4.8 // indirect
6463
github.com/olekukonko/tablewriter v0.0.5 // indirect
6564
github.com/opencontainers/go-digest v1.0.0 // indirect
6665
github.com/opencontainers/image-spec v1.0.2 // indirect
@@ -74,6 +73,7 @@ require (
7473
github.com/rjeczalik/notify v0.9.1 // indirect
7574
github.com/rs/cors v1.7.0 // indirect
7675
github.com/russross/blackfriday/v2 v2.0.1 // indirect
76+
scroll-tech/coordinator v1.0.0 // indirect
7777
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
7878
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
7979
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -92,5 +92,4 @@ require (
9292
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
9393
gopkg.in/yaml.v2 v2.4.0 // indirect
9494
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
scroll-tech/coordinator v1.0.0 // indirect
9695
)

‎bridge/go.sum‎

Lines changed: 256 additions & 1 deletion
Large diffs are not rendered by default.

‎build/lint.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func lint() {
5050
log.Fatalf("could not list pkgs: %v\n%s", err, string(out))
5151
}
5252

53-
cmd = exec.Command("golangci-lint")
53+
cmd = exec.Command(filepath.Join(goBin(), "golangci-lint"))
5454
cmd.Args = append(cmd.Args, "run", "--config", ".golangci.yml")
5555

5656
if *v {

‎coordinator/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Coordinator
22

3-
[![Actions Status](https://github.com/scroll-tech/coordinator/workflows/Continuous%20Integration/badge.svg)](https://github.com/scroll-tech/coordinator/actions)
3+
[![Actions Status](https://scroll-tech/coordinator/workflows/Continuous%20Integration/badge.svg)](https://scroll-tech/coordinator/actions)
44
[![codecov](https://codecov.io/gh/scroll-tech/coordinator/branch/master/graph/badge.svg)](https://codecov.io/gh/scroll-tech/coordinator)
55

66
This repo contains the Scroll coordinator.

‎coordinator/go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@ go 1.17
44

55
require (
66
github.com/gorilla/websocket v1.4.2
7-
github.com/jmoiron/sqlx v1.3.5
8-
github.com/mattn/go-colorable v0.1.11
9-
github.com/mattn/go-isatty v0.0.14
107
github.com/orcaman/concurrent-map v1.0.0
11-
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
12-
github.com/stretchr/testify v1.7.2
13-
github.com/urfave/cli/v2 v2.3.0
14-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
158
scroll-tech/bridge v1.0.0
9+
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
1610
scroll-tech/internal v1.0.0
1711
scroll-tech/store v1.0.0
1812
scroll-tech/utils v1.0.0
13+
github.com/stretchr/testify v1.7.2
14+
github.com/urfave/cli/v2 v2.3.0
15+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
1916
)
2017

2118
replace (
@@ -41,9 +38,7 @@ require (
4138
github.com/edsrzf/mmap-go v1.0.0 // indirect
4239
github.com/ethereum/go-ethereum v1.10.14 // indirect
4340
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
44-
github.com/fsnotify/fsnotify v1.5.1 // indirect
4541
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
46-
github.com/go-kit/kit v0.9.0 // indirect
4742
github.com/go-ole/go-ole v1.2.6 // indirect
4843
github.com/go-stack/stack v1.8.0 // indirect
4944
github.com/gogo/protobuf v1.3.2 // indirect
@@ -60,13 +55,15 @@ require (
6055
github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
6156
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
6257
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
58+
github.com/jmoiron/sqlx v1.3.5 // indirect
6359
github.com/lib/pq v1.10.6 // indirect
60+
github.com/mattn/go-colorable v0.1.11 // indirect
61+
github.com/mattn/go-isatty v0.0.14 // indirect
6462
github.com/mattn/go-runewidth v0.0.9 // indirect
6563
github.com/mitchellh/mapstructure v1.5.0 // indirect
6664
github.com/mitchellh/pointerstructure v1.2.0 // indirect
65+
github.com/nxadm/tail v1.4.8 // indirect
6766
github.com/olekukonko/tablewriter v0.0.5 // indirect
68-
github.com/onsi/ginkgo v1.16.4 // indirect
69-
github.com/onsi/gomega v1.16.0 // indirect
7067
github.com/opencontainers/go-digest v1.0.0 // indirect
7168
github.com/opencontainers/image-spec v1.0.2 // indirect
7269
github.com/opentracing/opentracing-go v1.1.0 // indirect

‎coordinator/go.sum‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/
131131
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
132132
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
133133
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
134-
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
135134
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
136135
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
137136
github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -144,7 +143,6 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
144143
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
145144
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
146145
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
147-
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
148146
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
149147
github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
150148
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -159,7 +157,6 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC
159157
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
160158
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
161159
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
162-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
163160
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
164161
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
165162
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -183,8 +180,6 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
183180
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
184181
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
185182
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
186-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
187-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
188183
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
189184
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
190185
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -199,7 +194,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
199194
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
200195
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
201196
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
202-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
203197
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
204198
github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
205199
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -346,12 +340,10 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
346340
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
347341
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
348342
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
349-
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
350343
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
351344
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
352345
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
353346
github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
354-
github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
355347
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
356348
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
357349
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
@@ -525,7 +517,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
525517
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
526518
golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
527519
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
528-
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
529520
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
530521
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
531522
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -578,7 +569,6 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w
578569
golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
579570
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
580571
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
581-
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
582572
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
583573
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
584574
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -640,7 +630,6 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK
640630
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
641631
golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
642632
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
643-
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
644633
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
645634
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
646635
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
@@ -691,8 +680,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
691680
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
692681
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
693682
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
694-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
695-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
696683
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
697684
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
698685
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ require (
66
github.com/docker/docker v20.10.17+incompatible
77
github.com/ethereum/go-ethereum v1.10.14
88
github.com/gorilla/websocket v1.4.2
9-
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
10-
github.com/stretchr/testify v1.7.2
119
scroll-tech/bridge v1.0.0
1210
scroll-tech/coordinator v1.0.0
13-
scroll-tech/store v1.0.0
11+
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
12+
github.com/stretchr/testify v1.7.2
1413
)
1514

1615
replace (
@@ -30,17 +29,17 @@ require (
3029
github.com/go-ole/go-ole v1.2.6 // indirect
3130
github.com/go-stack/stack v1.8.0 // indirect
3231
github.com/gogo/protobuf v1.3.2 // indirect
32+
github.com/google/go-cmp v0.5.7 // indirect
3333
github.com/google/uuid v1.3.0 // indirect
3434
github.com/holiman/uint256 v1.2.0 // indirect
3535
github.com/iden3/go-iden3-crypto v0.0.12 // indirect
36-
github.com/jmoiron/sqlx v1.3.5 // indirect
37-
github.com/lib/pq v1.10.6 // indirect
36+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
37+
github.com/morikuni/aec v1.0.0 // indirect
3838
github.com/opencontainers/go-digest v1.0.0 // indirect
3939
github.com/opencontainers/image-spec v1.0.2 // indirect
4040
github.com/orcaman/concurrent-map v1.0.0 // indirect
4141
github.com/pkg/errors v0.9.1 // indirect
4242
github.com/pmezard/go-difflib v1.0.0 // indirect
43-
github.com/pressly/goose/v3 v3.7.0 // indirect
4443
github.com/rjeczalik/notify v0.9.1 // indirect
4544
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
4645
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -53,4 +52,5 @@ require (
5352
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
5453
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
5554
gopkg.in/yaml.v3 v3.0.1 // indirect
55+
gotest.tools/v3 v3.4.0 // indirect
5656
)

0 commit comments

Comments
 (0)