Remove hard code initial amount deposits of osmosis pool

osmosis-labs · May 31, 2024 · 35fada8 · 35fada8
1 parent ace5b74
commit 35fada8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/tests/interchaintest/ibc_transfer_customfee_test.go b/tests/interchaintest/ibc_transfer_customfee_test.go
@@ -85,9 +85,10 @@ func TestFeeabsGaiaIBCTransferWithIBCFee(t *testing.T) {
 	require.Equal(t, amountToSend, osmosisUserBalance)
 
 	// Create pool Osmosis(stake)/uosmo on Osmosis, with 1:1 ratio
+	initAmount := amountToSend.Uint64() / 2
 	poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
 		Weights:        fmt.Sprintf("5%s,5%s", stakeOnOsmosis, osmosis.Config().Denom),
-		InitialDeposit: fmt.Sprintf("95000000%s,95000000%s", stakeOnOsmosis, osmosis.Config().Denom),
+		InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, osmosis.Config().Denom),
 		SwapFee:        "0.01",
 		ExitFee:        "0",
 		FutureGovernor: "",

diff --git a/tests/interchaintest/packet_foward_test.go b/tests/interchaintest/packet_foward_test.go
@@ -75,9 +75,10 @@ func TestPacketForwardMiddleware(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, amountToSend, osmosisUserBalance)
 
+	initAmount := amountToSend.Uint64() / 2
 	poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
 		Weights:        fmt.Sprintf("5%s,5%s", stakeOnOsmosis, uatomOnOsmosis),
-		InitialDeposit: fmt.Sprintf("95000000%s,950000000%s", stakeOnOsmosis, uatomOnOsmosis),
+		InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, uatomOnOsmosis),
 		SwapFee:        "0.01",
 		ExitFee:        "0",
 		FutureGovernor: "",

diff --git a/tests/interchaintest/query_osmosis_twap_test.go b/tests/interchaintest/query_osmosis_twap_test.go
@@ -72,9 +72,10 @@ func TestQueryOsmosisTwap(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, amountToSend, osmosisUserBalance)
 
+	initAmount := amountToSend.Uint64() / 2
 	poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
 		Weights:        fmt.Sprintf("5%s,5%s", stakeOnOsmosis, osmosis.Config().Denom),
-		InitialDeposit: fmt.Sprintf("95000000%s,950000000%s", stakeOnOsmosis, osmosis.Config().Denom),
+		InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, osmosis.Config().Denom),
 		SwapFee:        "0.01",
 		ExitFee:        "0",
 		FutureGovernor: "",

diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go
@@ -85,7 +85,7 @@ var (
 	pathFeeabsOsmosis   = "feeabs-osmosis"
 	pathOsmosisGaia     = "osmosis-gaia"
 	genesisWalletAmount = math.NewInt(100_000_000_000)
-	amountToSend        = math.NewInt(1_000_000)
+	amountToSend        = math.NewInt(1_000_000_000)
 )
 
 // feeabsEncoding registers the feeabs specific module codecs so that the associated types and msgs
@@ -136,7 +136,6 @@ func modifyGenesisWhitelistTwapQueryOsmosis() func(ibc.ChainConfig, []byte) ([]b
 		if err := dyno.Append(g, whitelist, "app_state", "interchainquery", "params", "allow_queries"); err != nil {
 			return nil, fmt.Errorf("failed to set whitelist in genesis json: %w", err)
 		}
-		fmt.Println("Genesis file updated", g)
 		out, err := json.Marshal(g)
 		if err != nil {
 			return nil, fmt.Errorf("failed to marshal genesis bytes to json: %w", err)
@@ -170,7 +169,6 @@ func modifyGenesisShortProposals(
 		if err := dyno.Set(g, queryEpochTime, "app_state", "feeabs", "epochs", 1, "duration"); err != nil {
 			return nil, fmt.Errorf("failed to set query epoch time in genesis json: %w", err)
 		}
-		fmt.Println("Genesis file updated", g)
 		out, err := json.Marshal(g)
 		if err != nil {
 			return nil, fmt.Errorf("failed to marshal genesis bytes to json: %w", err)