test: unit and e2e tests to ibc-quota

.github/workflows/tests.yml

@@ -186,3 +186,24 @@ jobs:
         run: |
           sleep 1m
           ./contrib/scripts/test_localnet_liveness.sh 50 5 50 localhost:26657
+
+  experimental-test-unit:
+    runs-on: ubuntu-latest
+    needs: install-tparse
+    steps:
+      - uses: actions/checkout@v3
+      - uses: technote-space/get-diff-action@v6.1.2
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - uses: actions/setup-go@v3
+        if: env.GIT_DIFF
+        with:
+          go-version: 1.19
+          cache: true
+      - name: Test the experimental features
+        if: env.GIT_DIFF
+        run: |
+          EXPERIMENTAL=true make test-unit

Makefile

@@ -158,7 +158,7 @@ test-unit-cover: ARGS=-timeout=10m -tags='$(UNIT_TEST_TAGS)' -coverprofile=$(TES
 test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-race: ARGS=-timeout=10m -race -tags='$(TEST_RACE_TAGS)'
 test-race: TEST_PACKAGES=$(PACKAGES_UNIT)
-test-e2e: ARGS=-timeout=25m -v --tags='$(TEST_E2E_TAGS)'
+test-e2e: ARGS=-timeout=25m -v -tags='$(TEST_E2E_TAGS)'
 test-e2e: TEST_PACKAGES=$(PACKAGES_E2E)
 $(TEST_TARGETS): run-tests
 

app/app.go

@@ -248,7 +248,7 @@ type UmeeApp struct {
 	LeverageKeeper     leveragekeeper.Keeper
 	OracleKeeper       oraclekeeper.Keeper
 	bech32IbcKeeper    bech32ibckeeper.Keeper
-	uibcQuotaKeeper    uibcquotakeeper.Keeper
+	UIbcQuotaKeeper    uibcquotakeeper.Keeper
 
 	// make scoped keepers public for testing purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -508,12 +508,12 @@ func New(
 
 	var ics4Wrapper ibcporttypes.ICS4Wrapper
 	if Experimental {
-		app.uibcQuotaKeeper = uibcquotakeeper.NewKeeper(
+		app.UIbcQuotaKeeper = uibcquotakeeper.NewKeeper(
 			appCodec,
 			keys[uibc.StoreKey],
 			app.IBCKeeper.ChannelKeeper, app.LeverageKeeper,
 		)
-		ics4Wrapper = app.uibcQuotaKeeper
+		ics4Wrapper = app.UIbcQuotaKeeper
 	} else {
 		ics4Wrapper = app.IBCKeeper.ChannelKeeper
 	}
@@ -554,7 +554,7 @@ func New(
 	)
 
 	if Experimental {
-		transferStack = uibcquota.NewIBCMiddleware(transferStack, app.uibcQuotaKeeper)
+		transferStack = uibcquota.NewIBCMiddleware(transferStack, app.UIbcQuotaKeeper)
 	}
 
 	// Create IBC Router
@@ -647,7 +647,7 @@ func New(
 		appModules = append(
 			appModules,
 			wasm.NewAppModule(app.appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
-			uibcmodule.NewAppModule(appCodec, app.uibcQuotaKeeper),
+			uibcmodule.NewAppModule(appCodec, app.UIbcQuotaKeeper),
 		)
 	}
 

go.mod

@@ -317,6 +317,7 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gotest.tools v2.2.0+incompatible
 	honnef.co/go/tools v0.3.3 // indirect
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect

go.sum

@@ -1901,6 +1901,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=

x/oracle/keeper/keeper_test.go

@@ -28,6 +28,25 @@ import (
 const (
 	displayDenom string = appparams.DisplayDenom
 	bondDenom    string = appparams.BondDenom
+	initialPower        = int64(10000000000)
+)
+
+// Test addresses
+var (
+	valPubKeys = simapp.CreateTestPubKeys(2)
+
+	valPubKey = valPubKeys[0]
+	pubKey    = secp256k1.GenPrivKey().PubKey()
+	addr      = sdk.AccAddress(pubKey.Address())
+	valAddr   = sdk.ValAddress(pubKey.Address())
+
+	valPubKey2 = valPubKeys[1]
+	pubKey2    = secp256k1.GenPrivKey().PubKey()
+	addr2      = sdk.AccAddress(pubKey2.Address())
+	valAddr2   = sdk.ValAddress(pubKey2.Address())
+
+	initTokens = sdk.TokensFromConsensusPower(initialPower, sdk.DefaultPowerReduction)
+	initCoins  = sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, initTokens))
 )
 
 type IntegrationTestSuite struct {
@@ -39,10 +58,6 @@ type IntegrationTestSuite struct {
 	msgServer   types.MsgServer
 }
 
-const (
-	initialPower = int64(10000000000)
-)
-
 func (s *IntegrationTestSuite) SetupTest() {
 	require := s.Require()
 	isCheckTx := false
@@ -76,24 +91,6 @@ func (s *IntegrationTestSuite) SetupTest() {
 	s.msgServer = keeper.NewMsgServerImpl(app.OracleKeeper)
 }
 
-// Test addresses
-var (
-	valPubKeys = simapp.CreateTestPubKeys(2)
-
-	valPubKey = valPubKeys[0]
-	pubKey    = secp256k1.GenPrivKey().PubKey()
-	addr      = sdk.AccAddress(pubKey.Address())
-	valAddr   = sdk.ValAddress(pubKey.Address())
-
-	valPubKey2 = valPubKeys[1]
-	pubKey2    = secp256k1.GenPrivKey().PubKey()
-	addr2      = sdk.AccAddress(pubKey2.Address())
-	valAddr2   = sdk.ValAddress(pubKey2.Address())
-
-	initTokens = sdk.TokensFromConsensusPower(initialPower, sdk.DefaultPowerReduction)
-	initCoins  = sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, initTokens))
-)
-
 // NewTestMsgCreateValidator test msg creator
 func NewTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey, amt sdk.Int) *stakingtypes.MsgCreateValidator {
 	commission := stakingtypes.NewCommissionRates(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec())

x/uibc/client/cli/query.go

@@ -34,7 +34,7 @@ func GetCmdQueryParams() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "params",
 		Args:  cobra.NoArgs,
-		Short: "Query the x/uibc module parameters",
+		Short: "Query the uibc module parameters",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {

x/uibc/client/tests/cli_test.go

@@ -0,0 +1,45 @@
+//go:build experimental
+// +build experimental
+
+package tests
+
+import (
+	"testing"
+
+	gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+	umeeapp "github.com/umee-network/umee/v4/app"
+)
+
+func TestIntegrationTestSuite(t *testing.T) {
+	cfg := umeeapp.IntegrationTestNetworkConfig()
+	cfg.NumValidators = 2
+	cfg.Mnemonics = []string{
+		"empower ridge mystery shrimp predict alarm swear brick across funny vendor essay antique vote place lava proof gaze crush head east arch twin lady",
+		"clean target advice dirt onion correct original vibrant actor upon waste eternal color barely shrimp aspect fall material wait repeat bench demise length seven",
+	}
+
+	var gravityGenState gravitytypes.GenesisState
+	require.NoError(t, cfg.Codec.UnmarshalJSON(cfg.GenesisState[gravitytypes.ModuleName], &gravityGenState))
+
+	gravityGenState.DelegateKeys = []gravitytypes.MsgSetOrchestratorAddress{
+		{
+			Validator:    "umeevaloper1t3ass54lpra0klz047k0dax33ckahym5phdrpg",
+			Orchestrator: "umee1t3ass54lpra0klz047k0dax33ckahym5pn2vsz",
+			EthAddress:   "0x9fc56f2e851e1ab2b4c0fc4f6344800f29652ffe",
+		},
+		{
+			Validator:    "umeevaloper1kqh6nt4f48vptvq4j5cgr0nfd2x4z9ulvrtqrh",
+			Orchestrator: "umee1kqh6nt4f48vptvq4j5cgr0nfd2x4z9ulv8v0ja",
+			EthAddress:   "0xddfda961410b2815b48679377baa0009ace173a2",
+		},
+	}
+
+	bz, err := cfg.Codec.MarshalJSON(&gravityGenState)
+	require.NoError(t, err)
+
+	cfg.GenesisState[gravitytypes.ModuleName] = bz
+
+	suite.Run(t, NewIntegrationTestSuite(cfg))
+}

x/uibc/client/tests/query.go

@@ -0,0 +1,73 @@
+//go:build experimental
+// +build experimental
+
+package tests
+
+import (
+	"fmt"
+	"testing"
+
+	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
+	tmcli "github.com/tendermint/tendermint/libs/cli"
+
+	"github.com/umee-network/umee/v4/x/uibc"
+	"github.com/umee-network/umee/v4/x/uibc/client/cli"
+)
+
+func (s *IntegrationTestSuite) TestQueryParams() {
+	val := s.network.Validators[0]
+	clientCtx := val.ClientCtx
+
+	args := []string{
+		fmt.Sprintf("--%s=json", tmcli.OutputFlag),
+	}
+	out, err := clitestutil.ExecTestCLICmd(clientCtx, cli.GetCmdQueryParams(), args)
+	s.Require().NoError(err)
+
+	var res uibc.QueryParamsResponse
+	s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res))
+	s.Require().NotEmpty(res.Params)
+}
+
+func (s *IntegrationTestSuite) TestGetQuota() {
+	val := s.network.Validators[0]
+	clientCtx := val.ClientCtx
+
+	tests := []struct {
+		name        string
+		args        []string
+		errExpected bool
+		noOfRecords int
+	}{
+		{
+			name: "Get ibc-transfer quota of all denoms",
+			args: []string{
+				fmt.Sprintf("--%s=json", tmcli.OutputFlag),
+			},
+			errExpected: false,
+			noOfRecords: 0,
+		},
+		{
+			name: "Get ibc-transfer quota of denom umee",
+			args: []string{
+				"uumee",
+				fmt.Sprintf("--%s=json", tmcli.OutputFlag),
+			},
+			errExpected: true,
+			noOfRecords: 0,
+		},
+	}
+
+	for _, tc := range tests {
+		s.T().Run(tc.name, func(t *testing.T) {
+			out, err := clitestutil.ExecTestCLICmd(clientCtx, cli.GetQuota(), tc.args)
+			if tc.errExpected {
+				s.Require().Error(err)
+			} else {
+				var res uibc.QueryQuotaResponse
+				s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res))
+				s.Require().Equal(len(res.Quota), tc.noOfRecords)
+			}
+		})
+	}
+}

x/uibc/client/tests/suite.go

@@ -0,0 +1,38 @@
+//go:build experimental
+// +build experimental
+
+package tests
+
+import (
+	"github.com/cosmos/cosmos-sdk/testutil/network"
+	"github.com/stretchr/testify/suite"
+)
+
+type IntegrationTestSuite struct {
+	suite.Suite
+
+	cfg     network.Config
+	network *network.Network
+}
+
+func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {
+	return &IntegrationTestSuite{cfg: cfg}
+}
+
+func (s *IntegrationTestSuite) SetupSuite() {
+	t := s.T()
+	t.Log("setting up integration test suite")
+
+	var err error
+	s.network, err = network.New(t, t.TempDir(), s.cfg)
+	s.Require().NoError(err)
+
+	_, err = s.network.WaitForHeight(1)
+	s.Require().NoError(err)
+}
+
+func (s *IntegrationTestSuite) TearDownSuite() {
+	s.T().Log("tearing down integration test suite")
+
+	s.network.Cleanup()
+}

x/uibc/genesis_test.go

@@ -0,0 +1,30 @@
+//go:build experimental
+// +build experimental
+
+package uibc
+
+import (
+	"testing"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"gotest.tools/assert"
+)
+
+func TestGenesisValidation(t *testing.T) {
+	gs := DefaultGenesisState()
+	err := gs.Validate()
+	assert.NilError(t, err)
+
+	gs.TotalOutflowSum = sdk.NewDec(-123123)
+	err = gs.Validate()
+	assert.ErrorContains(t, err, "total outflow sum shouldn't be negative")
+
+	gs.Quotas = []Quota{
+		{
+			IbcDenom:   "umee",
+			OutflowSum: sdk.NewDec(-11123123),
+		},
+	}
+	err = gs.Validate()
+	assert.ErrorContains(t, err, "ibc denom quota expires shouldn't be empty")
+}