Skip to content

Commit 39a726b

Browse files
mergify[bot]mergify[bot]
authored
refactor(server/v2): simplify app manager (partial backport #22300) (#22323)
1 parent 89219a3 commit 39a726b

File tree

10 files changed

+39
-41
lines changed

10 files changed

+39
-41
lines changed

‎server/v2/cometbft/abci.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var _ abci.Application = (*Consensus[transaction.Tx])(nil)
4242
type Consensus[T transaction.Tx] struct {
4343
logger log.Logger
4444
appName, version string
45-
app *appmanager.AppManager[T]
45+
app appmanager.AppManager[T]
4646
appCloser func() error
4747
txCodec transaction.Codec[T]
4848
store types.Store
@@ -77,7 +77,7 @@ type Consensus[T transaction.Tx] struct {
7777
func NewConsensus[T transaction.Tx](
7878
logger log.Logger,
7979
appName string,
80-
app *appmanager.AppManager[T],
80+
app appmanager.AppManager[T],
8181
appCloser func() error,
8282
mp mempool.Mempool[T],
8383
indexedEvents map[string]struct{},

‎server/v2/cometbft/abci_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock.
646646
}, nil
647647
})
648648

649-
s, err := stf.NewSTF(
649+
s, err := stf.New(
650650
log.NewNopLogger().With("module", "stf"),
651651
msgRouterBuilder,
652652
queryRouterBuilder,
@@ -672,21 +672,20 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock.
672672
sc := cometmock.NewMockCommiter(log.NewNopLogger(), string(actorName), "stf")
673673
mockStore := cometmock.NewMockStore(ss, sc)
674674

675-
b := appmanager.Builder[mock.Tx]{
676-
STF: s,
677-
DB: mockStore,
675+
am := appmanager.New(appmanager.Config{
678676
ValidateTxGasLimit: gasLimit,
679677
QueryGasLimit: gasLimit,
680678
SimulationGasLimit: gasLimit,
681-
InitGenesis: func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) {
679+
},
680+
mockStore,
681+
s,
682+
func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) {
682683
_, st, err := mockStore.StateLatest()
683684
require.NoError(t, err)
684685
return branch.DefaultNewWriterMap(st), nil
685686
},
686-
}
687-
688-
am, err := b.Build()
689-
require.NoError(t, err)
687+
nil,
688+
)
690689

691690
return NewConsensus[mock.Tx](log.NewNopLogger(), "testing-app", am, func() error { return nil }, mempool, map[string]struct{}{}, nil, mockStore, Config{AppTomlConfig: DefaultAppTomlConfig()}, mock.TxCodec{}, "test")
692691
}

‎server/v2/cometbft/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ require (
2121
cosmossdk.io/core v1.0.0-alpha.4
2222
cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5
2323
cosmossdk.io/log v1.4.1
24-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c // main
25-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c // main
26-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c // main
24+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c // main
25+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c // main
26+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c // main
2727
cosmossdk.io/store/v2 v2.0.0-20241017091405-f01baf302e2b // main
2828
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
2929
github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f

‎server/v2/cometbft/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
2424
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
2525
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac h1:3joNZZWZ3k7fMsrBDL1ktuQ2xQwYLZOaDhkruadDFmc=
2626
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
27-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c h1:P6Em4H2U4nSem6VzgCDZgu0tzqDGmhHe6FN48vnd8TQ=
28-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c/go.mod h1:mqEGRyHXCcB1ozs177VfstarUVYWKogXdqGET4vUT24=
29-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c h1:MJCOTFyL7lPlMDUFvylEu/2zyFe7NcYe4eMaZowvzk4=
30-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c/go.mod h1:/xDfniqVtn5nraiHkNJ4e6rYU0e83YAGsSjwmUA6H8k=
31-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c h1:thOij3diZWxwfKaSJNS6S1SFX+fnOW93emnuu+WSHJY=
32-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c/go.mod h1:MjuTMonZ319tZQX6CV2O5E/+F85KrkNUj5U5ObrrkWs=
27+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c h1:LK1ycnBLeAE/anYr8lGSg36GB5iDaBnmv0qcS/jbsCs=
28+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c/go.mod h1:FMGQ99V9+I3gpQV7nidWAtxMSRAwRizt2wqbAD7Z81I=
29+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c h1:yKf19uDz3nJNEcud3G2KAzIf/dxkurGD0gSef5sZVfs=
30+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c/go.mod h1:o20qgxElItJvBh+k9DJedXE2tp6udkNrWaf5Fn1mSb4=
31+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c h1:MbjFJxzzr1vuXBI9ih/agdTl9fX4nvzhOBbsi38I7Yk=
32+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c/go.mod h1:MjuTMonZ319tZQX6CV2O5E/+F85KrkNUj5U5ObrrkWs=
3333
cosmossdk.io/store v1.0.0-rc.0.0.20241009154331-597e0fac1173 h1:MlvTcx2h4zmZZtIDg35B6bovbb5iUAExPmvaPE1Zci4=
3434
cosmossdk.io/store v1.0.0-rc.0.0.20241009154331-597e0fac1173/go.mod h1:lrhcXu/hRXrLJP4L8syVbs68GJU1WSRBFO3mmjn5oGc=
3535
cosmossdk.io/store/v2 v2.0.0-20241017091405-f01baf302e2b h1:epPBD1ebUwat6Ruw40rsEU4N9CHJ2ZN0ev8EGoNYBvE=

‎server/v2/cometbft/server.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
101101
}
102102

103103
s.logger = logger.With(log.ModuleKey, s.Name())
104-
rs := appI.GetStore()
104+
rs := appI.Store()
105105
consensus := NewConsensus(
106106
s.logger,
107107
appI.Name(),
108-
appI.GetAppManager(),
108+
appI,
109109
appI.Close,
110110
s.serverOptions.Mempool(cfg),
111111
indexEvents,
112-
appI.GetQueryHandlers(),
112+
appI.QueryHandlers(),
113113
rs,
114114
s.config,
115115
s.initTxCodec,
@@ -131,7 +131,6 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
131131
return err
132132
}
133133
consensus.snapshotManager = snapshots.NewManager(snapshotStore, s.serverOptions.SnapshotOptions(cfg), sc, ss, nil, s.logger)
134-
135134
s.Consensus = consensus
136135

137136
return nil

‎simapp/v2/app_di.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ func (app *SimApp[T]) TxConfig() client.TxConfig {
218218
return app.txConfig
219219
}
220220

221-
// GetStore returns the root store.
222-
func (app *SimApp[T]) GetStore() store.RootStore {
221+
// Store returns the root store.
222+
func (app *SimApp[T]) Store() store.RootStore {
223223
return app.store
224224
}
225225

‎simapp/v2/app_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func NewTestApp(t *testing.T) (*SimApp[transaction.Tx], context.Context) {
7171
genesisBytes, err := json.Marshal(genesis)
7272
require.NoError(t, err)
7373

74-
st := app.GetStore()
74+
st := app.Store()
7575
ci, err := st.LastCommitID()
7676
require.NoError(t, err)
7777

@@ -107,7 +107,7 @@ func MoveNextBlock(t *testing.T, app *SimApp[transaction.Tx], ctx context.Contex
107107

108108
bz := sha256.Sum256([]byte{})
109109

110-
st := app.GetStore()
110+
st := app.Store()
111111
ci, err := st.LastCommitID()
112112
require.NoError(t, err)
113113

‎simapp/v2/export.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (app *SimApp[T]) ExportAppStateAndValidators(
2929
return exportedApp, err
3030
}
3131

32-
readerMap, err := app.GetStore().StateAt(latestHeight)
32+
readerMap, err := app.Store().StateAt(latestHeight)
3333
if err != nil {
3434
return exportedApp, err
3535
}

‎simapp/v2/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
cosmossdk.io/depinject v1.0.0
1111
cosmossdk.io/log v1.4.1
1212
cosmossdk.io/math v1.3.0
13-
cosmossdk.io/runtime/v2 v2.0.0-20241017091405-f01baf302e2b // main
14-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c // main
13+
cosmossdk.io/runtime/v2 v2.0.0-20241021134528-681366e3469c // main
14+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c // main
1515
cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
1616
cosmossdk.io/store/v2 v2.0.0-20241017091405-f01baf302e2b // main
1717
cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000
@@ -62,8 +62,8 @@ require (
6262
cosmossdk.io/errors v1.0.1 // indirect
6363
cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect
6464
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac // indirect
65-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c // indirect; main
66-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c // indirect; main
65+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c // indirect; main
66+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c // indirect; main
6767
cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // indirect; main
6868
cosmossdk.io/x/tx v0.13.4-0.20241003111526-30003f667944 // indirect; main
6969
filippo.io/edwards25519 v1.1.0 // indirect

‎simapp/v2/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,16 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
210210
cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
211211
cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
212212
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
213-
cosmossdk.io/runtime/v2 v2.0.0-20241017091405-f01baf302e2b h1:h/jxffgtZTMa1qvqz9+5c4uOCxpcEWxYuwHONjd16IM=
214-
cosmossdk.io/runtime/v2 v2.0.0-20241017091405-f01baf302e2b/go.mod h1:KROAOJt1EDL7nELDT7LPpFqWubhTJFD4Uwa1gy2/yxo=
213+
cosmossdk.io/runtime/v2 v2.0.0-20241021134528-681366e3469c h1:f9qU7HpJ1CuUDj4OkHca4BFbSW4X3rAYgwzwFNXiBhg=
214+
cosmossdk.io/runtime/v2 v2.0.0-20241021134528-681366e3469c/go.mod h1:KROAOJt1EDL7nELDT7LPpFqWubhTJFD4Uwa1gy2/yxo=
215215
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac h1:3joNZZWZ3k7fMsrBDL1ktuQ2xQwYLZOaDhkruadDFmc=
216216
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
217-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c h1:P6Em4H2U4nSem6VzgCDZgu0tzqDGmhHe6FN48vnd8TQ=
218-
cosmossdk.io/server/v2 v2.0.0-20241014060734-0b43fcc2164c/go.mod h1:mqEGRyHXCcB1ozs177VfstarUVYWKogXdqGET4vUT24=
219-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c h1:MJCOTFyL7lPlMDUFvylEu/2zyFe7NcYe4eMaZowvzk4=
220-
cosmossdk.io/server/v2/appmanager v0.0.0-20241008175849-325728a9fd6c/go.mod h1:/xDfniqVtn5nraiHkNJ4e6rYU0e83YAGsSjwmUA6H8k=
221-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c h1:thOij3diZWxwfKaSJNS6S1SFX+fnOW93emnuu+WSHJY=
222-
cosmossdk.io/server/v2/stf v0.0.0-20241008175849-325728a9fd6c/go.mod h1:MjuTMonZ319tZQX6CV2O5E/+F85KrkNUj5U5ObrrkWs=
217+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c h1:LK1ycnBLeAE/anYr8lGSg36GB5iDaBnmv0qcS/jbsCs=
218+
cosmossdk.io/server/v2 v2.0.0-20241021134528-681366e3469c/go.mod h1:FMGQ99V9+I3gpQV7nidWAtxMSRAwRizt2wqbAD7Z81I=
219+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c h1:yKf19uDz3nJNEcud3G2KAzIf/dxkurGD0gSef5sZVfs=
220+
cosmossdk.io/server/v2/appmanager v0.0.0-20241021134528-681366e3469c/go.mod h1:o20qgxElItJvBh+k9DJedXE2tp6udkNrWaf5Fn1mSb4=
221+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c h1:MbjFJxzzr1vuXBI9ih/agdTl9fX4nvzhOBbsi38I7Yk=
222+
cosmossdk.io/server/v2/stf v0.0.0-20241021134528-681366e3469c/go.mod h1:MjuTMonZ319tZQX6CV2O5E/+F85KrkNUj5U5ObrrkWs=
223223
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 h1:UUW0+2UgbDwQ452o2aw4DrVSWmowcad7DB7Vln+N94I=
224224
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214/go.mod h1:ct8HATr+s48YYTRXEyP3HF33v9qEVWHMxwOL8P/v4iQ=
225225
cosmossdk.io/store/v2 v2.0.0-20241017091405-f01baf302e2b h1:epPBD1ebUwat6Ruw40rsEU4N9CHJ2ZN0ev8EGoNYBvE=

0 commit comments

Comments
 (0)