fix: rename function name and add a contract for order

Finschia · Aug 22, 2023 · 31a7073 · 31a7073
1 parent d4ca2ea
commit 31a7073
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,6 @@
 * [\#71](https://github.com/Finschia/wasmd/pull/71) add test cases in ContractsByCode
 * [\#82](https://github.com/Finschia/wasmd/pull/82) add test case to QueryInactiveContracts
 
-
 ### Bug Fixes
 * [\#62](https://github.com/Finschia/wasmd/pull/62) fill ContractHistory querier result's Updated field
 * [\#52](https://github.com/Finschia/wasmd/pull/52) fix cli_test error of wasmplus and add cli_test ci

diff --git a/x/wasmplus/keeper/querier_test.go b/x/wasmplus/keeper/querier_test.go
@@ -23,15 +23,19 @@ func TestQueryInactiveContracts(t *testing.T) {
 	ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1)
 	example2 := InstantiateHackatomExampleContract(t, ctx, keepers)
 	ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1)
+	example3 := InstantiateHackatomExampleContract(t, ctx, keepers)
+	ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1)
 
 	// Address order of contracts is ascending order of byte array whose address is decoded by bech32
-	expAddrs := CreateOrderedAddresses(example1.Contract.Bytes(), example2.Contract.Bytes())
+	expAddrs := GenerateSortedBech32Address(example1.Contract.Bytes(), example2.Contract.Bytes(), example3.Contract.Bytes())
 
 	// set inactive
 	err := keeper.deactivateContract(ctx, example1.Contract)
 	require.NoError(t, err)
 	err = keeper.deactivateContract(ctx, example2.Contract)
 	require.NoError(t, err)
+	err = keeper.deactivateContract(ctx, example3.Contract)
+	require.NoError(t, err)
 
 	q := Querier(keeper)
 	specs := map[string]struct {
@@ -47,16 +51,16 @@ func TestQueryInactiveContracts(t *testing.T) {
 		"query all": {
 			srcQuery:           &types.QueryInactiveContractsRequest{},
 			expAddrs:           expAddrs,
-			expPaginationTotal: 2,
+			expPaginationTotal: 3,
 		},
 		"with pagination offset": {
 			srcQuery: &types.QueryInactiveContractsRequest{
 				Pagination: &query.PageRequest{
 					Offset: 1,
 				},
 			},
-			expAddrs:           []string{expAddrs[1]},
-			expPaginationTotal: 2,
+			expAddrs:           []string{expAddrs[1], expAddrs[2]},
+			expPaginationTotal: 3,
 		},
 		"with invalid pagination key": {
 			srcQuery: &types.QueryInactiveContractsRequest{
@@ -82,7 +86,7 @@ func TestQueryInactiveContracts(t *testing.T) {
 					Key: fromBase64("reSl9YA6Q5g1xjY5Wo1kje5XsvyQ2Y3Bf6iHFZtpY4s="),
 				},
 			},
-			expAddrs:           []string{expAddrs[1]},
+			expAddrs:           []string{expAddrs[1], expAddrs[2]},
 			expPaginationTotal: 0,
 		},
 	}

diff --git a/x/wasmplus/keeper/test_common.go b/x/wasmplus/keeper/test_common.go
@@ -690,7 +690,7 @@ func keyPubAddr() (crypto.PrivKey, crypto.PubKey, sdk.AccAddress) {
 	return key, pub, addr
 }
 
-func CreateOrderedAddresses(addrs ...[]byte) []string {
+func GenerateSortedBech32Address(addrs ...[]byte) []string {
 	sort.Slice(addrs, func(i, j int) bool {
 		return string(addrs[i]) < string(addrs[j])
 	})