Skip to content

Commit fa989ca

Browse files
committed
fmt
1 parent 2ff333b commit fa989ca

File tree

10 files changed

+28
-19
lines changed

10 files changed

+28
-19
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ fmt: ## Format the code
3131
cd $(PWD)/rollup/ && go mod tidy
3232
cd $(PWD)/tests/integration-test/ && go mod tidy
3333

34-
goimports -local $(PWD)/bridge-history-api/ -w .
35-
goimports -local $(PWD)/common/ -w .
36-
goimports -local $(PWD)/coordinator/ -w .
37-
goimports -local $(PWD)/database/ -w .
38-
goimports -local $(PWD)/rollup/ -w .
39-
goimports -local $(PWD)/tests/integration-test/ -w .
34+
goimports -local scroll-tech/bridge-history-api/ -w .
35+
goimports -local scroll-tech/common/ -w .
36+
goimports -local scroll-tech/coordinator/ -w .
37+
goimports -local scroll-tech/database/ -w .
38+
goimports -local scroll-tech/rollup/ -w .
39+
goimports -local scroll-tech/tests/integration-test/ -w .
4040

4141
dev_docker: ## Build docker images for development/testing usages
4242
docker pull postgres

coordinator/internal/logic/provertask/bundle_prover_task.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"github.com/scroll-tech/go-ethereum/params"
1414
"gorm.io/gorm"
1515

16-
"scroll-tech/common/types"
17-
"scroll-tech/common/types/message"
18-
"scroll-tech/common/utils"
19-
2016
"scroll-tech/coordinator/internal/config"
2117
"scroll-tech/coordinator/internal/orm"
2218
coordinatorType "scroll-tech/coordinator/internal/types"
2319
cutils "scroll-tech/coordinator/internal/utils"
20+
21+
"scroll-tech/common/types"
22+
"scroll-tech/common/types/message"
23+
"scroll-tech/common/utils"
2424
)
2525

2626
// BundleProverTask is prover task implement for bundle proof

coordinator/internal/orm/orm_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99
"github.com/stretchr/testify/assert"
1010
"gorm.io/gorm"
1111

12+
"scroll-tech/database/migrate"
13+
1214
"scroll-tech/common/testcontainers"
1315
"scroll-tech/common/types"
1416
"scroll-tech/common/types/message"
1517
"scroll-tech/common/utils"
16-
"scroll-tech/database/migrate"
1718
)
1819

1920
var (

coordinator/test/api_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import (
2020
"github.com/stretchr/testify/assert"
2121
"gorm.io/gorm"
2222

23+
"scroll-tech/database/migrate"
24+
2325
"scroll-tech/common/testcontainers"
2426
"scroll-tech/common/types"
2527
"scroll-tech/common/types/message"
2628
"scroll-tech/common/version"
27-
"scroll-tech/database/migrate"
2829

2930
"scroll-tech/coordinator/internal/config"
3031
"scroll-tech/coordinator/internal/controller/api"

rollup/internal/config/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package config
33
import (
44
"fmt"
55
"reflect"
6-
"scroll-tech/common/database"
76
"strings"
87

8+
"scroll-tech/common/database"
9+
910
"github.com/mitchellh/mapstructure"
1011
"github.com/scroll-tech/go-ethereum/common"
1112
"github.com/scroll-tech/go-ethereum/rpc"

rollup/internal/controller/sender/sender_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ import (
2727
"github.com/stretchr/testify/assert"
2828
"gorm.io/gorm"
2929

30+
"scroll-tech/database/migrate"
31+
3032
"scroll-tech/common/testcontainers"
3133
"scroll-tech/common/types"
32-
"scroll-tech/database/migrate"
3334

3435
bridgeAbi "scroll-tech/rollup/abi"
3536
"scroll-tech/rollup/internal/config"

rollup/internal/controller/watcher/watcher_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import (
1111
"github.com/stretchr/testify/assert"
1212
"gorm.io/gorm"
1313

14+
"scroll-tech/database/migrate"
15+
1416
"scroll-tech/common/database"
1517
"scroll-tech/common/testcontainers"
16-
"scroll-tech/database/migrate"
1718

1819
"scroll-tech/rollup/internal/config"
1920
)

rollup/internal/orm/orm_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ import (
1313
"github.com/stretchr/testify/assert"
1414
"gorm.io/gorm"
1515

16+
"scroll-tech/database/migrate"
17+
1618
"scroll-tech/common/testcontainers"
1719
"scroll-tech/common/types"
1820
"scroll-tech/common/types/message"
19-
"scroll-tech/database/migrate"
2021

2122
"scroll-tech/rollup/internal/utils"
2223
)

rollup/tests/bridge_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ import (
2222
"github.com/stretchr/testify/assert"
2323
"gorm.io/gorm"
2424

25+
"scroll-tech/database/migrate"
26+
2527
"scroll-tech/common/database"
2628
tc "scroll-tech/common/testcontainers"
2729
"scroll-tech/common/utils"
28-
"scroll-tech/database/migrate"
2930

3031
bcmd "scroll-tech/rollup/cmd"
3132
"scroll-tech/rollup/mock_bridge"

tests/integration-test/integration_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ import (
1212
"github.com/stretchr/testify/assert"
1313
"gorm.io/gorm"
1414

15+
"scroll-tech/integration-test/orm"
16+
17+
"scroll-tech/database/migrate"
18+
1519
"scroll-tech/common/testcontainers"
1620
"scroll-tech/common/utils"
1721
"scroll-tech/common/version"
18-
"scroll-tech/database/migrate"
19-
"scroll-tech/integration-test/orm"
2022

2123
capp "scroll-tech/coordinator/cmd/api/app"
2224

0 commit comments

Comments
 (0)