Merge branch 'main' of https://github.com/terra-money/alliance into f…

…ix/rounding
terra-money · Feb 1, 2023 · b5f4e53 · b5f4e53
2 parents a99cf91 + f99ab38
commit b5f4e53
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -87,10 +87,10 @@ install: go.sum
 ###                                Test                                     ###
 ###############################################################################
 
-test: test-unit-keeper
+test: test-unit
 
-test-unit-keeper:
-	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' github.com/terra-money/alliance/x/alliance/keeper github.com/terra-money/alliance/x/alliance/types
+test-unit:
+	@VERSION=$(VERSION) go test -v -mod=readonly -tags='ledger test_ledger_mock' github.com/terra-money/alliance/x/alliance/keeper/tests github.com/terra-money/alliance/x/alliance/types/tests
 
 ###############################################################################
 ###                                Linting                                  ###

diff --git a/x/alliance/keeper/asset_test.go → x/alliance/keeper/tests/asset_test.go b/x/alliance/keeper/asset_test.go → x/alliance/keeper/tests/asset_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/delegation_test.go → x/alliance/keeper/tests/delegation_test.go b/x/alliance/keeper/delegation_test.go → x/alliance/keeper/tests/delegation_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/genesis_test.go → x/alliance/keeper/tests/genesis_test.go b/x/alliance/keeper/genesis_test.go → x/alliance/keeper/tests/genesis_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/grpc_query_test.go → x/alliance/keeper/tests/grpc_query_test.go b/x/alliance/keeper/grpc_query_test.go → x/alliance/keeper/tests/grpc_query_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/keeper_test.go → x/alliance/keeper/tests/keeper_test.go b/x/alliance/keeper/keeper_test.go → x/alliance/keeper/tests/keeper_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/proposal_test.go → x/alliance/keeper/tests/proposal_test.go b/x/alliance/keeper/proposal_test.go → x/alliance/keeper/tests/proposal_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/reward_test.go → x/alliance/keeper/tests/reward_test.go b/x/alliance/keeper/reward_test.go → x/alliance/keeper/tests/reward_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/keeper/slash_test.go → x/alliance/keeper/tests/slash_test.go b/x/alliance/keeper/slash_test.go → x/alliance/keeper/tests/slash_test.go
@@ -1,4 +1,4 @@
-package keeper_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/module.go b/x/alliance/module.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"math/rand"
 
+	simulation2 "github.com/terra-money/alliance/x/alliance/tests/simulation"
+
 	// this line is used by starport scaffolding # 1
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -15,7 +17,6 @@ import (
 
 	"github.com/terra-money/alliance/x/alliance/client/cli"
 	"github.com/terra-money/alliance/x/alliance/keeper"
-	"github.com/terra-money/alliance/x/alliance/simulation"
 	"github.com/terra-money/alliance/x/alliance/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -138,21 +139,21 @@ func (a AppModule) ConsensusVersion() uint64 {
 }
 
 func (a AppModule) GenerateGenesisState(simState *module.SimulationState) {
-	simulation.RandomizedGenesisState(simState)
+	simulation2.RandomizedGenesisState(simState)
 }
 
 func (a AppModule) ProposalContents(simState module.SimulationState) []simtypes.WeightedProposalContent {
 	return nil
 }
 
 func (a AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange {
-	return simulation.ParamChanges(r)
+	return simulation2.ParamChanges(r)
 }
 
 func (a AppModule) RegisterStoreDecoder(registry sdk.StoreDecoderRegistry) {
-	registry[types.StoreKey] = simulation.NewDecodeStore(a.cdc)
+	registry[types.StoreKey] = simulation2.NewDecodeStore(a.cdc)
 }
 
 func (a AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation {
-	return simulation.WeightedOperations(simState.AppParams, a.pcdc, a.accountKeeper, a.bankKeeper, a.stakingKeeper, a.keeper)
+	return simulation2.WeightedOperations(simState.AppParams, a.pcdc, a.accountKeeper, a.bankKeeper, a.stakingKeeper, a.keeper)
 }
diff --git a/x/alliance/benchmark/benchmark_test.go → x/alliance/tests/benchmark/benchmark_test.go b/x/alliance/benchmark/benchmark_test.go → x/alliance/tests/benchmark/benchmark_test.go
@@ -6,6 +6,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/terra-money/alliance/x/alliance/tests/benchmark"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -14,7 +16,6 @@ import (
 
 	test_helpers "github.com/terra-money/alliance/app"
 	"github.com/terra-money/alliance/x/alliance"
-	"github.com/terra-money/alliance/x/alliance/benchmark"
 	"github.com/terra-money/alliance/x/alliance/types"
 )
 

diff --git a/x/alliance/benchmark/test_helper.go → x/alliance/tests/benchmark/test_helper.go b/x/alliance/benchmark/test_helper.go → x/alliance/tests/benchmark/test_helper.go
diff --git a/x/alliance/e2e/delegate_undelegate_test.go → ...nce/tests/e2e/delegate_undelegate_test.go b/x/alliance/e2e/delegate_undelegate_test.go → ...nce/tests/e2e/delegate_undelegate_test.go
diff --git a/x/alliance/e2e/test_helper.go → x/alliance/tests/e2e/test_helper.go b/x/alliance/e2e/test_helper.go → x/alliance/tests/e2e/test_helper.go
diff --git a/x/alliance/simulation/decoder.go → x/alliance/tests/simulation/decoder.go b/x/alliance/simulation/decoder.go → x/alliance/tests/simulation/decoder.go
diff --git a/x/alliance/simulation/genesis.go → x/alliance/tests/simulation/genesis.go b/x/alliance/simulation/genesis.go → x/alliance/tests/simulation/genesis.go
diff --git a/x/alliance/simulation/operations.go → x/alliance/tests/simulation/operations.go b/x/alliance/simulation/operations.go → x/alliance/tests/simulation/operations.go
diff --git a/x/alliance/simulation/params.go → x/alliance/tests/simulation/params.go b/x/alliance/simulation/params.go → x/alliance/tests/simulation/params.go
diff --git a/x/alliance/types/keys_test.go → x/alliance/types/tests/keys_test.go b/x/alliance/types/keys_test.go → x/alliance/types/tests/keys_test.go
@@ -1,4 +1,4 @@
-package types_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/types/types_test.go → x/alliance/types/tests/types_test.go b/x/alliance/types/types_test.go → x/alliance/types/tests/types_test.go
@@ -1,4 +1,4 @@
-package types_test
+package tests_test
 
 import (
 	"testing"

diff --git a/x/alliance/types/validator_test.go → x/alliance/types/tests/validator_test.go b/x/alliance/types/validator_test.go → x/alliance/types/tests/validator_test.go
@@ -1,4 +1,4 @@
-package types_test
+package tests_test
 
 import (
 	"testing"