fix(e2e): define common use const for ibc denom

Signed-off-by: Artur Troian <[email protected]>
akash-network · Aug 14, 2023 · 285a363 · 285a363
1 parent fe0b7ae
commit 285a363
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/integration/container2container_test.go b/integration/container2container_test.go
@@ -37,7 +37,7 @@ func (s *E2EContainerToContainer) TestE2EContainerToContainer() {
 		s.validator.ClientCtx,
 		s.keyTenant.GetAddress(),
 		deploymentPath,
-		cliGlobalFlags(deploymentDeposit,
+		cliGlobalFlags(deploymentUAktDeposit,
 			fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
 	)
 	s.Require().NoError(err)

diff --git a/integration/customcurrency_test.go b/integration/customcurrency_test.go
@@ -37,14 +37,12 @@ func (s *E2ECustomCurrency) TestDefaultStorageClass() {
 		DSeq:  uint64(100),
 	}
 
-	deploymentDeposit := "--deposit=5000000ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84"
-
 	// Create Deployments
 	res, err := deploycli.TxCreateDeploymentExec(
 		s.validator.ClientCtx,
 		s.keyTenant.GetAddress(),
 		deploymentPath,
-		cliGlobalFlags(deploymentDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
+		cliGlobalFlags(deploymentAxlUSDCDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
 	)
 	s.Require().NoError(err)
 	s.Require().NoError(s.waitForBlocksCommitted(7))

diff --git a/integration/e2e_test.go b/integration/e2e_test.go
@@ -69,11 +69,14 @@ type IntegrationTestSuite struct {
 const (
 	defaultGasPrice      = "0.03uakt"
 	defaultGasAdjustment = "1.4"
-	defaultMinDeposit    = "5000000uakt"
+	uaktMinDeposit       = "5000000uakt"
+	axlUSDCDenom         = "ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84"
+	axlUSCDMinDeposit    = "5000000" + axlUSDCDenom
 )
 
 var (
-	deploymentDeposit = fmt.Sprintf("--deposit=%s", defaultMinDeposit)
+	deploymentUAktDeposit    = fmt.Sprintf("--deposit=%s", uaktMinDeposit)
+	deploymentAxlUSDCDeposit = fmt.Sprintf("--deposit=%s", axlUSCDMinDeposit)
 )
 
 func cliGlobalFlags(args ...string) []string {
@@ -88,8 +91,6 @@ func cliGlobalFlags(args ...string) []string {
 func (s *IntegrationTestSuite) SetupSuite() {
 	s.appHost, s.appPort = appEnv(s.T())
 
-	const testCoin = "ibc/12C6A0C374171B595A0A9E18B83FA09D295FB1F2D8C6DAA3AC28683471752D84"
-
 	// Create a network for test
 	cfg := testutil.DefaultConfig(testutil.WithInterceptState(func(cdc codec.Codec, s string, istate json.RawMessage) json.RawMessage {
 		var res json.RawMessage
@@ -100,15 +101,15 @@ func (s *IntegrationTestSuite) SetupSuite() {
 			cdc.MustUnmarshalJSON(istate, state)
 
 			state.Params.DenomTakeRates = append(state.Params.DenomTakeRates, ttypes.DenomTakeRate{
-				Denom: testCoin,
+				Denom: axlUSDCDenom,
 				Rate:  20,
 			})
 
 			res = cdc.MustMarshalJSON(state)
 		case "deployment":
 			state := &dtypes.GenesisState{}
 			cdc.MustUnmarshalJSON(istate, state)
-			state.Params.MinDeposits = append(state.Params.MinDeposits, sdk.NewInt64Coin(testCoin, 5000000))
+			state.Params.MinDeposits = append(state.Params.MinDeposits, sdk.NewInt64Coin(axlUSDCDenom, 5000000))
 
 			res = cdc.MustMarshalJSON(state)
 		}
@@ -137,7 +138,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	// Send coins value
 	sendTokens := sdk.Coins{
 		sdk.NewCoin(s.cfg.BondDenom, mtypes.DefaultBidMinDeposit.Amount.MulRaw(4)),
-		sdk.NewCoin(testCoin, mtypes.DefaultBidMinDeposit.Amount.MulRaw(4)),
+		sdk.NewCoin(axlUSDCDenom, mtypes.DefaultBidMinDeposit.Amount.MulRaw(4)),
 	}
 
 	// Setup a Provider key

diff --git a/integration/escrow_monitor_test.go b/integration/escrow_monitor_test.go
@@ -39,7 +39,7 @@ func (s *E2EEscrowMonitor) TestE2EEscrowMonitor() {
 		s.validator.ClientCtx,
 		s.keyTenant.GetAddress(),
 		deploymentPath,
-		cliGlobalFlags(deploymentDeposit,
+		cliGlobalFlags(deploymentUAktDeposit,
 			fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
 	)
 	s.Require().NoError(err)

diff --git a/integration/persistentstorage_test.go b/integration/persistentstorage_test.go
@@ -50,7 +50,7 @@ func (s *E2EPersistentStorageDefault) TestDefaultStorageClass() {
 		s.validator.ClientCtx,
 		s.keyTenant.GetAddress(),
 		deploymentPath,
-		cliGlobalFlags(deploymentDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
+		cliGlobalFlags(deploymentUAktDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
 	)
 	s.Require().NoError(err)
 	s.Require().NoError(s.waitForBlocksCommitted(7))
@@ -151,7 +151,7 @@ func (s *E2EPersistentStorageBeta2) TestDedicatedStorageClass() {
 		s.validator.ClientCtx,
 		s.keyTenant.GetAddress(),
 		deploymentPath,
-		cliGlobalFlags(deploymentDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
+		cliGlobalFlags(deploymentUAktDeposit, fmt.Sprintf("--dseq=%v", deploymentID.DSeq))...,
 	)
 	s.Require().NoError(err)
 	s.Require().NoError(s.waitForBlocksCommitted(7))