From 660ffc8be5e14d41bcf7dff45ad983f02ed596a6 Mon Sep 17 00:00:00 2001 From: Jonathan Gimeno Date: Tue, 25 Feb 2020 18:01:18 +0100 Subject: [PATCH] refactor ordering functions --- simapp/test_helpers.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index cfedd7d318..78f2fbc414 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -82,7 +82,8 @@ func SetupWithGenesisAccounts(genAccs []authexported.GenesisAccount, balances .. type GenerateAccountStrategy func(int) []sdk.AccAddress -func Random(accNum int) []sdk.AccAddress { +// random is a strategy used by addTestAddrs() in order to generated addresses in random order. +func random(accNum int) []sdk.AccAddress { testAddrs := make([]sdk.AccAddress, accNum) for i := 0; i < accNum; i++ { pk := ed25519.GenPrivKey().PubKey() @@ -92,7 +93,8 @@ func Random(accNum int) []sdk.AccAddress { return testAddrs } -func Incremental(accNum int) []sdk.AccAddress { +// incremental is a strategy used by addTestAddrs() in order to generated addresses in ascending order. +func incremental(accNum int) []sdk.AccAddress { var addresses []sdk.AccAddress var buffer bytes.Buffer @@ -114,13 +116,13 @@ func Incremental(accNum int) []sdk.AccAddress { // AddTestAddrs constructs and returns accNum amount of accounts with an // initial balance of accAmt in random order func AddTestAddrs(app *SimApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sdk.AccAddress { - return addTestAddrs(app, ctx, accNum, accAmt, Random) + return addTestAddrs(app, ctx, accNum, accAmt, random) } // AddTestAddrs constructs and returns accNum amount of accounts with an // initial balance of accAmt in random order func AddTestAddrsIncremental(app *SimApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sdk.AccAddress { - return addTestAddrs(app, ctx, accNum, accAmt, Incremental) + return addTestAddrs(app, ctx, accNum, accAmt, incremental) } func addTestAddrs(app *SimApp, ctx sdk.Context, accNum int, accAmt sdk.Int, strategy GenerateAccountStrategy) []sdk.AccAddress {