Move benchmark into module

baseapp/baseapp_test.go

@@ -3,7 +3,6 @@ package baseapp
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cosmos/cosmos-sdk/x/bank"
 	"os"
 	"testing"
 
@@ -20,6 +19,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
+	"github.com/cosmos/cosmos-sdk/x/bank"
 )
 
 func defaultLogger() log.Logger {

x/auth/mock/simulate_block.go

@@ -56,20 +56,18 @@ func GenTx(msgs []sdk.Msg, accnums []int64, seq []int64, priv ...crypto.PrivKeyE
 
 // generate a set of signed transactions a msg, that differ only by having the
 // sequence numbers incremented between every transaction.
-func GenSequenceOfTxs(msgs []sdk.Msg, accnums []int64, init_seq_nums []int64, num_to_generate int, priv ...crypto.PrivKeyEd25519) []auth.StdTx {
-	copy_of_init_seq_nums := make([]int64, len(init_seq_nums), len(init_seq_nums))
-	copy(copy_of_init_seq_nums, init_seq_nums)
-	txs := make([]auth.StdTx, num_to_generate, num_to_generate)
-	for i := 0; i < num_to_generate; i++ {
-		txs[i] = GenTx(msgs, accnums, copy_of_init_seq_nums, priv...)
-		incrementAllSequenceNumbers(copy_of_init_seq_nums)
+func GenSequenceOfTxs(msgs []sdk.Msg, accnums []int64, initSeqNums []int64, numToGenerate int, priv ...crypto.PrivKeyEd25519) []auth.StdTx {
+	txs := make([]auth.StdTx, numToGenerate, numToGenerate)
+	for i := 0; i < numToGenerate; i++ {
+		txs[i] = GenTx(msgs, accnums, initSeqNums, priv...)
+		incrementAllSequenceNumbers(initSeqNums)
 	}
 	return txs
 }
 
-func incrementAllSequenceNumbers(init_seq_nums []int64) {
-	for i := 0; i < len(init_seq_nums); i++ {
-		init_seq_nums[i] += 1
+func incrementAllSequenceNumbers(initSeqNums []int64) {
+	for i := 0; i < len(initSeqNums); i++ {
+		initSeqNums[i]++
 	}
 }
 

x/bank/app_test.go

@@ -77,11 +77,24 @@ var (
 
 // initialize the mock application for this module
 func getMockApp(t *testing.T) *mock.App {
-	mapp, err := GetBenchmarkMockApp()
+	mapp, err := getBenchmarkMockApp()
 	require.NoError(t, err)
 	return mapp
 }
 
+// getBenchmarkMockApp initializes a mock application for this module, for purposes of benchmarking
+// Any long term API support commitments do not apply to this function.
+func getBenchmarkMockApp() (*mock.App, error) {
+	mapp := mock.NewApp()
+
+	RegisterWire(mapp.Cdc)
+	coinKeeper := NewKeeper(mapp.AccountMapper)
+	mapp.Router().AddRoute("bank", NewHandler(coinKeeper))
+
+	err := mapp.CompleteSetup([]*sdk.KVStoreKey{})
+	return mapp, err
+}
+
 func TestMsgSendWithAccounts(t *testing.T) {
 	mapp := getMockApp(t)
 

tests/bench/block_processing_time_test.go → x/bank/bench_test.go

@@ -1,30 +1,17 @@
-package benchmarking
+package bank
 
 import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/mock"
-	"github.com/cosmos/cosmos-sdk/x/bank"
-	abci "github.com/tendermint/abci/types"
-	crypto "github.com/tendermint/go-crypto"
-)
 
-var (
-	priv1    = crypto.GenPrivKeyEd25519()
-	addr1    = priv1.PubKey().Address()
-	priv2    = crypto.GenPrivKeyEd25519()
-	addr2    = priv2.PubKey().Address()
-	coins    = sdk.Coins{sdk.NewCoin("foocoin", 10)}
-	sendMsg1 = bank.MsgSend{
-		Inputs:  []bank.Input{bank.NewInput(addr1, coins)},
-		Outputs: []bank.Output{bank.NewOutput(addr2, coins)},
-	}
+	abci "github.com/tendermint/abci/types"
 )
 
 func BenchmarkOneBankSendTxPerBlock(b *testing.B) {
-	benchmarkApp, _ := bank.GetBenchmarkMockApp()
+	benchmarkApp, _ := getBenchmarkMockApp()
 
 	// Add an account at genesis
 	acc := &auth.BaseAccount{