LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore(network): remove DefaultConfigWithAppConfigWithQueryGasLimit (#21055)

Browse Source
This commit is contained in:
Julien Robert 2024-07-26 10:16:12 +02:00 committed by GitHub
parent 502450cd1e
commit cc5c4d0699
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/server/grpc/out_of_gas_test.go
View File

@ -17,6 +17,7 @@ import (
_ "cosmossdk.io/x/consensus"
_ "cosmossdk.io/x/staking"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/testutil/configurator"
"github.com/cosmos/cosmos-sdk/testutil/network"
@ -36,7 +37,7 @@ func (s *IntegrationTestOutOfGasSuite) SetupSuite() {
var err error
s.T().Log("setting up integration test suite")
s.cfg, err = network.DefaultConfigWithAppConfigWithQueryGasLimit(configurator.NewAppConfig(
s.cfg, err = network.DefaultConfigWithAppConfig(configurator.NewAppConfig(
configurator.AccountsModule(),
configurator.AuthModule(),
configurator.BankModule(),
@ -44,7 +45,7 @@ func (s *IntegrationTestOutOfGasSuite) SetupSuite() {
configurator.StakingModule(),
configurator.ConsensusModule(),
configurator.TxModule(),
), 10)
), baseapp.SetQueryGasLimit(10))
s.NoError(err)
s.cfg.NumValidators = 1

15
testutil/network/network.go
View File

@ -163,11 +163,7 @@ func DefaultConfig(factory TestFixtureFactory) Config {
}
}
func DefaultConfigWithAppConfig(appConfig depinject.Config) (Config, error) {
return DefaultConfigWithAppConfigWithQueryGasLimit(appConfig, 0)
}
func DefaultConfigWithAppConfigWithQueryGasLimit(appConfig depinject.Config, queryGasLimit uint64) (Config, error) {
func DefaultConfigWithAppConfig(appConfig depinject.Config, baseappOpts ...func(*baseapp.BaseApp)) (Config, error) {
var (
appBuilder *runtime.AppBuilder
txConfig client.TxConfig
@ -222,10 +218,11 @@ func DefaultConfigWithAppConfigWithQueryGasLimit(appConfig depinject.Config, que
app := appBuilder.Build(
dbm.NewMemDB(),
nil,
baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)),
baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices),
baseapp.SetChainID(cfg.ChainID),
baseapp.SetQueryGasLimit(queryGasLimit),
append(baseappOpts,
baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)),
baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices),
baseapp.SetChainID(cfg.ChainID),
)...,
)
testdata.RegisterQueryServer(app.GRPCQueryRouter(), testdata.QueryImpl{})