diff --git a/loadtest/main.go b/loadtest/main.go index b453e43ba2..bf512a2f87 100644 --- a/loadtest/main.go +++ b/loadtest/main.go @@ -137,7 +137,7 @@ func (c *LoadTestClient) generateMessage(config Config, key cryptotypes.PrivKey, case randNum <= 0.66: msg = &tokenfactorytypes.MsgMint{ Sender: denomCreatorAddr, - Amount: sdk.Coin{Denom: denom, Amount: sdk.NewInt(1000000)}, + Amount: sdk.Coin{Denom: denom, Amount: sdk.NewInt(10000000000000)}, } default: msg = &tokenfactorytypes.MsgBurn{ @@ -218,22 +218,26 @@ func (c *LoadTestClient) generateMessage(config Config, key cryptotypes.PrivKey, return msg, false } -func generateDexOrderPlacements(config Config, key cryptotypes.PrivKey, batchSize uint64, price sdk.Dec, quantity sdk.Dec) []*dextypes.Order { - orderPlacements := []*dextypes.Order{} - var orderType dextypes.OrderType +func sampleDexOrderType(config Config) (orderType dextypes.OrderType) { if config.MessageType == "failure_bank_malformed" { orderType = -1 } else { - dexMsgType := config.MsgTypeDistr.SampleDexMsgs() - switch dexMsgType { + msgType := config.MsgTypeDistr.SampleDexMsgs() + switch msgType { case Limit: orderType = dextypes.OrderType_LIMIT case Market: orderType = dextypes.OrderType_MARKET default: - panic(fmt.Sprintf("Unknown message type %s\n", dexMsgType)) + panic(fmt.Sprintf("Unknown message type %s\n", msgType)) } } + return orderType +} + +func generateDexOrderPlacements(config Config, key cryptotypes.PrivKey, msgPerTx uint64, price sdk.Dec, quantity sdk.Dec) (orderPlacements []*dextypes.Order) { + orderType := sampleDexOrderType(config) + var direction dextypes.PositionDirection if rand.Float64() < 0.5 { direction = dextypes.PositionDirection_LONG @@ -242,7 +246,7 @@ func generateDexOrderPlacements(config Config, key cryptotypes.PrivKey, batchSiz } contract := config.ContractDistr.Sample() - for j := 0; j < int(batchSize); j++ { + for j := 0; j < int(msgPerTx); j++ { orderPlacements = append(orderPlacements, &dextypes.Order{ Account: sdk.AccAddress(key.PubKey().Address()).String(), ContractAddr: contract, diff --git a/x/oracle/simulation/operations.go b/x/oracle/simulation/operations.go index 2028e73625..3988c4b164 100644 --- a/x/oracle/simulation/operations.go +++ b/x/oracle/simulation/operations.go @@ -65,7 +65,7 @@ func WeightedOperations( } // SimulateMsgAggregateExchangeRateVote generates a MsgAggregateExchangeRateVote with random values. -// nolint: funlen +//nolint: funlen func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation { return func( r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, @@ -122,7 +122,7 @@ func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankK } // SimulateMsgDelegateFeedConsent generates a MsgDelegateFeedConsent with random values. -// nolint: funlen +//nolint: funlen func SimulateMsgDelegateFeedConsent(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation { return func( r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,