diff --git a/app/test_helpers.go b/app/test_helpers.go index 42179a90..3fafc811 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -35,8 +35,8 @@ import ( // WasmApp testing. var DefaultConsensusParams = &abci.ConsensusParams{ Block: &abci.BlockParams{ - MaxBytes: 2000000, - MaxGas: 20000000, + MaxBytes: 8000000, + MaxGas: 80000000, }, Evidence: &tmproto.EvidenceParams{ MaxAgeNumBlocks: 302400, diff --git a/benchmarks/app_test.go b/benchmarks/app_test.go index c4363831..eb90a089 100644 --- a/benchmarks/app_test.go +++ b/benchmarks/app_test.go @@ -132,14 +132,22 @@ func InitializeWasmApp(b testing.TB, db dbm.DB, numAccounts int) AppInfo { codeID := uint64(1) // instantiate the contract + initialBalances := make([]balance, numAccounts+1) + for i := 0; i <= numAccounts; i++ { + acct := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()).String() + if i == 0 { + acct = addr.String() + } + initialBalances[i] = balance{ + Address: acct, + Amount: 1000000000, + } + } init := cw20InitMsg{ Name: "Cash Money", Symbol: "CASH", Decimals: 2, - InitialBalances: []balance{{ - Address: addr.String(), - Amount: 100000000000, - }}, + InitialBalances: initialBalances, } initBz, err := json.Marshal(init) require.NoError(b, err) @@ -150,7 +158,8 @@ func InitializeWasmApp(b testing.TB, db dbm.DB, numAccounts int) AppInfo { Label: "Demo contract", Msg: initBz, } - initTx, err := helpers.GenTx(txGen, []sdk.Msg{&initMsg}, nil, 500000, "", []uint64{0}, []uint64{1}, minter) + gasWanted := 500000 + 10000*uint64(numAccounts) + initTx, err := helpers.GenTx(txGen, []sdk.Msg{&initMsg}, nil, gasWanted, "", []uint64{0}, []uint64{1}, minter) require.NoError(b, err) _, res, err = wasmApp.Deliver(txGen.TxEncoder(), initTx) require.NoError(b, err) diff --git a/benchmarks/bench_test.go b/benchmarks/bench_test.go index 530fc43d..ecbab75c 100644 --- a/benchmarks/bench_test.go +++ b/benchmarks/bench_test.go @@ -73,33 +73,37 @@ func BenchmarkTxSending(b *testing.B) { db: buildMemDB, blockSize: 20, txBuilder: buildTxFromMsg(bankSendMsg), + numAccounts: 50, }, "cw20 transfer - memdb": { db: buildMemDB, blockSize: 20, txBuilder: buildTxFromMsg(cw20TransferMsg), + numAccounts: 50, }, "basic send - leveldb": { db: buildLevelDB, blockSize: 20, txBuilder: buildTxFromMsg(bankSendMsg), + numAccounts: 50, }, "cw20 transfer - leveldb": { db: buildLevelDB, blockSize: 20, txBuilder: buildTxFromMsg(cw20TransferMsg), + numAccounts: 50, }, - "basic send - leveldb - 10k accounts": { + "basic send - leveldb - 8k accounts": { db: buildLevelDB, blockSize: 20, txBuilder: buildTxFromMsg(bankSendMsg), - numAccounts: 10000, + numAccounts: 8000, }, - "cw20 transfer - leveldb - 10k accounts": { + "cw20 transfer - leveldb - 8k accounts": { db: buildLevelDB, blockSize: 20, txBuilder: buildTxFromMsg(cw20TransferMsg), - numAccounts: 10000, + numAccounts: 8000, }, }