Skip to content

Commit 0836a1d

Browse files
author
colinlyguo
committed
remove db-client
1 parent d12c2b4 commit 0836a1d

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

database/cmd/app/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func resetDB(ctx *cli.Context) error {
4242
}
4343

4444
var version int64
45-
err = migrate.ResetDB(db.DB)
45+
err = migrate.Rollback(db.DB, &version)
4646
if err != nil {
4747
return err
4848
}

rollup/cmd/proposer_tool/app/app.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"scroll-tech/common/types"
2121
"scroll-tech/common/utils"
2222
"scroll-tech/common/version"
23+
"scroll-tech/database/migrate"
2324

2425
"scroll-tech/rollup/internal/config"
2526
"scroll-tech/rollup/internal/controller/watcher"
@@ -58,6 +59,14 @@ func action(ctx *cli.Context) error {
5859
if err != nil {
5960
log.Crit("failed to init db connection", "err", err)
6061
}
62+
sqlDB, err := db.DB()
63+
if err != nil {
64+
log.Crit("failed to get db connection", "error", err)
65+
}
66+
if err = migrate.ResetDB(sqlDB); err != nil {
67+
log.Crit("failed to reset db", "error", err)
68+
}
69+
log.Info("successfully reset db")
6170
defer func() {
6271
cancel()
6372
if err = database.CloseDB(db); err != nil {

rollup/docker-compose-proposer-tool.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,13 @@ services:
1717
timeout: 5s
1818
retries: 5
1919

20-
db-client:
21-
build:
22-
context: ..
23-
dockerfile: ./build/dockerfiles/db_cli.Dockerfile
24-
depends_on:
25-
db:
26-
condition: service_healthy
27-
command: ["reset", "--config", "/app/conf/proposer-tool-db-config.json"]
28-
volumes:
29-
- ./proposer-tool-db-config.json:/app/conf/proposer-tool-db-config.json
30-
3120
proposer-tool:
3221
build:
3322
context: ..
3423
dockerfile: ./rollup/proposer_tool.Dockerfile
3524
depends_on:
36-
db-client:
37-
condition: service_completed_successfully
25+
db:
26+
condition: service_healthy
3827
command: [
3928
"--config", "/app/conf/proposer-tool-config.json",
4029
"--genesis", "/app/conf/proposer-tool-genesis.json",

rollup/proposer-tool-db-config.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)