Skip to content

Commit 6d4992b

Browse files
mergify[bot]kocubinskijulienrbrt
authored
refactor(server/v2/cometbft): drop sqlite (partial backport #22424) (#22700)
Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 9273375 commit 6d4992b

File tree

9 files changed

+31
-36
lines changed

9 files changed

+31
-36
lines changed

‎server/v2/cometbft/abci_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ package cometbft
22

33
import (
44
"context"
5-
"cosmossdk.io/core/server"
65
"crypto/sha256"
76
"encoding/json"
87
"errors"
9-
abci "github.com/cometbft/cometbft/abci/types"
108
"io"
119
"strings"
1210
"sync"
1311
"testing"
1412
"time"
1513

16-
"cosmossdk.io/server/v2/cometbft/oe"
14+
abci "github.com/cometbft/cometbft/abci/types"
1715
abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1816
v1 "github.com/cometbft/cometbft/api/cometbft/types/v1"
1917
"github.com/cosmos/gogoproto/proto"
2018
gogotypes "github.com/cosmos/gogoproto/types"
2119
"github.com/stretchr/testify/require"
2220

2321
appmodulev2 "cosmossdk.io/core/appmodule/v2"
22+
"cosmossdk.io/core/server"
2423
"cosmossdk.io/core/store"
2524
"cosmossdk.io/core/transaction"
2625
"cosmossdk.io/log"
2726
"cosmossdk.io/server/v2/appmanager"
2827
"cosmossdk.io/server/v2/cometbft/handlers"
2928
cometmock "cosmossdk.io/server/v2/cometbft/internal/mock"
3029
"cosmossdk.io/server/v2/cometbft/mempool"
30+
"cosmossdk.io/server/v2/cometbft/oe"
3131
"cosmossdk.io/server/v2/cometbft/types"
3232
"cosmossdk.io/server/v2/stf"
3333
"cosmossdk.io/server/v2/stf/branch"
@@ -60,10 +60,10 @@ func getQueryRouterBuilder[T any, PT interface {
6060
*T
6161
proto.Message
6262
},
63-
U any, UT interface {
64-
*U
65-
proto.Message
66-
}](
63+
U any, UT interface {
64+
*U
65+
proto.Message
66+
}](
6767
t *testing.T,
6868
handler func(ctx context.Context, msg PT) (UT, error),
6969
) *stf.MsgRouterBuilder {
@@ -90,10 +90,10 @@ func getMsgRouterBuilder[T any, PT interface {
9090
*T
9191
transaction.Msg
9292
},
93-
U any, UT interface {
94-
*U
95-
transaction.Msg
96-
}](
93+
U any, UT interface {
94+
*U
95+
transaction.Msg
96+
}](
9797
t *testing.T,
9898
handler func(ctx context.Context, msg PT) (UT, error),
9999
) *stf.MsgRouterBuilder {

‎server/v2/cometbft/go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ require (
2020
cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5
2121
cosmossdk.io/log v1.5.0
2222
cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b //main
23-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37 // main
23+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8 // main
2424
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 // main
2525
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 // main
26-
cosmossdk.io/store/v2 v2.0.0-20241108140525-43e28b43ad7a // main
26+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8 // main
2727
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
2828
github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
2929
github.com/cometbft/cometbft/api v1.0.0-rc2
@@ -126,7 +126,6 @@ require (
126126
github.com/magiconair/properties v1.8.7 // indirect
127127
github.com/mattn/go-colorable v0.1.13 // indirect
128128
github.com/mattn/go-isatty v0.0.20 // indirect
129-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
130129
github.com/minio/highwayhash v1.0.3 // indirect
131130
github.com/mitchellh/mapstructure v1.5.0 // indirect
132131
github.com/mtibben/percent v0.2.1 // indirect

‎server/v2/cometbft/go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
2424
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
2525
cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo=
2626
cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
27-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37 h1:zZvYQ/xSv5hsWcJiZOOqYrywzMm2TN+xdkedPgRdoss=
28-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37/go.mod h1:T4ptCA8LAxlBZ/MYJQTHMPNuvb+cgMsrPX31njPtJmw=
27+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8 h1:FkHyUGwkMdohzNls+7qmg7nPjOLidMDOP6X0N21kD5g=
28+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
2929
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 h1:GOznErJieaI0OS0LDUsu5Vy3qPnCyjdvkncejP0Zv5s=
3030
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
3131
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 h1:cK7wvmlA18AvLcaInseKTBmt5EXtLwafe7oH1rx7veU=
3232
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
3333
cosmossdk.io/store v1.0.0-rc.0.0.20241108140525-43e28b43ad7a h1:5ENKFUhhJPkpx6dGDmc0/LXinjE3oIQDEES9gVVA4xM=
3434
cosmossdk.io/store v1.0.0-rc.0.0.20241108140525-43e28b43ad7a/go.mod h1:pjNPBX9giCOI18kf3mgNtn4J3SFaZbV1mAmM58iHdgg=
35-
cosmossdk.io/store/v2 v2.0.0-20241108140525-43e28b43ad7a h1:3SB9LPBiLuy8pCUPgfFtCP9I4wYKYajxv5vssyO5YEs=
36-
cosmossdk.io/store/v2 v2.0.0-20241108140525-43e28b43ad7a/go.mod h1:akxEBNSxcn4HQXXa3xU6xhfJAR08zBCZjQoo3W3Xfr0=
35+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8 h1:LvlYyjMBF6+CV3lOCnkZqNk0+LkVehDnTPHh+JLO7Mg=
36+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
3737
cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk=
3838
cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo=
3939
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
@@ -361,8 +361,6 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
361361
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
362362
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
363363
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
364-
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
365-
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
366364
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
367365
github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q=
368366
github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ=

‎server/v2/cometbft/internal/mock/mock_store.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
dbm "cosmossdk.io/store/v2/db"
1313
"cosmossdk.io/store/v2/proof"
1414
"cosmossdk.io/store/v2/storage"
15-
"cosmossdk.io/store/v2/storage/sqlite"
15+
"cosmossdk.io/store/v2/storage/pebbledb"
1616
)
1717

1818
type MockStore struct {
@@ -21,7 +21,7 @@ type MockStore struct {
2121
}
2222

2323
func NewMockStorage(logger log.Logger, dir string) storev2.VersionedWriter {
24-
storageDB, _ := sqlite.New(dir)
24+
storageDB, _ := pebbledb.New(dir)
2525
ss := storage.NewStorageStore(storageDB, logger)
2626
return ss
2727
}

‎server/v2/cometbft/oe/optimistic_execution_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import (
55
"errors"
66
"testing"
77

8+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
9+
"github.com/stretchr/testify/assert"
10+
811
"cosmossdk.io/core/server"
912
"cosmossdk.io/core/store"
1013
"cosmossdk.io/core/transaction"
1114
"cosmossdk.io/log"
12-
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
13-
"github.com/stretchr/testify/assert"
1415
)
1516

1617
func testFinalizeBlock[T transaction.Tx](context.Context, *abci.FinalizeBlockRequest) (*server.BlockResponse, store.WriterMap, []T, error) {

‎server/v2/cometbft/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cometbft
22

33
import (
44
"context"
5-
"cosmossdk.io/server/v2/cometbft/oe"
65
"crypto/sha256"
76
"encoding/json"
87
"fmt"
@@ -35,6 +34,7 @@ import (
3534
"cosmossdk.io/server/v2/appmanager"
3635
cometlog "cosmossdk.io/server/v2/cometbft/log"
3736
"cosmossdk.io/server/v2/cometbft/mempool"
37+
"cosmossdk.io/server/v2/cometbft/oe"
3838
"cosmossdk.io/server/v2/cometbft/types"
3939
"cosmossdk.io/store/v2/snapshots"
4040

‎simapp/v2/go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
cosmossdk.io/log v1.5.0
1212
cosmossdk.io/math v1.4.0
1313
cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 // main
14-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37 // main
14+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8 // main
1515
cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
16-
cosmossdk.io/store/v2 v2.0.0-20241108144957-78b5cd4dbd08 // main
16+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8 // main
1717
cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000
1818
cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
1919
cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
@@ -175,7 +175,6 @@ require (
175175
github.com/mattn/go-colorable v0.1.13 // indirect
176176
github.com/mattn/go-isatty v0.0.20 // indirect
177177
github.com/mattn/go-runewidth v0.0.15 // indirect
178-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
179178
github.com/mdp/qrterminal/v3 v3.2.0 // indirect
180179
github.com/minio/highwayhash v1.0.3 // indirect
181180
github.com/mitchellh/go-homedir v1.1.0 // indirect

‎simapp/v2/go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,16 @@ cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 h1:hYI7pvrmdkgFZJ4HVQ
214214
cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95/go.mod h1:J4Wv2eOwAz8t14Ak8XBMWDoFbwqwyllMaJF91O7n/wI=
215215
cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo=
216216
cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
217-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37 h1:zZvYQ/xSv5hsWcJiZOOqYrywzMm2TN+xdkedPgRdoss=
218-
cosmossdk.io/server/v2 v2.0.0-20241128145253-6cfe2dc1bb37/go.mod h1:T4ptCA8LAxlBZ/MYJQTHMPNuvb+cgMsrPX31njPtJmw=
217+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8 h1:FkHyUGwkMdohzNls+7qmg7nPjOLidMDOP6X0N21kD5g=
218+
cosmossdk.io/server/v2 v2.0.0-20241129190247-24d456db40a8/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
219219
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 h1:GOznErJieaI0OS0LDUsu5Vy3qPnCyjdvkncejP0Zv5s=
220220
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
221221
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 h1:cK7wvmlA18AvLcaInseKTBmt5EXtLwafe7oH1rx7veU=
222222
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
223223
cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95 h1:5hIgRL6VsicdJ7FVK6AG7cSy1C8tiVbCp6W3Y+QQ5ko=
224224
cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95/go.mod h1:ceNwMZIU8ZIDoeUdA9+sGxz3GVt0orEGoVpkBfa/UtU=
225-
cosmossdk.io/store/v2 v2.0.0-20241108144957-78b5cd4dbd08 h1:7dIhcS/VhEM/vnZWDVtDKqCF/OGaq8Gx+5ekD9GT71k=
226-
cosmossdk.io/store/v2 v2.0.0-20241108144957-78b5cd4dbd08/go.mod h1:A2aW375561viy3GcD8GhUwUWnow+R2Du6yCSpAGwsgY=
225+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8 h1:LvlYyjMBF6+CV3lOCnkZqNk0+LkVehDnTPHh+JLO7Mg=
226+
cosmossdk.io/store/v2 v2.0.0-20241129190247-24d456db40a8/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
227227
cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk=
228228
cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo=
229229
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -680,8 +680,6 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
680680
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
681681
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
682682
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
683-
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
684-
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
685683
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
686684
github.com/mdp/qrterminal/v3 v3.2.0 h1:qteQMXO3oyTK4IHwj2mWsKYYRBOp1Pj2WRYFYYNTCdk=
687685
github.com/mdp/qrterminal/v3 v3.2.0/go.mod h1:XGGuua4Lefrl7TLEsSONiD+UEjQXJZ4mPzF+gWYIJkk=

‎tools/confix/data/v2-app.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ minimum-gas-prices = '0stake'
5656
app-db-backend = 'goleveldb'
5757

5858
[store.options]
59-
# State storage database type. Currently we support: "sqlite", "pebble" and "rocksdb"
60-
ss-type = 'sqlite'
59+
# State storage database type. Currently we support: "pebble" and "rocksdb"
60+
ss-type = 'pebble'
6161
# State commitment database type. Currently we support: "iavl" and "iavl-v2"
6262
sc-type = 'iavl'
6363

0 commit comments

Comments
 (0)