Removed redundant + fixed fee bump

cheqd · Jan 27, 2025 · 1d43400 · 1d43400
1 parent 85a3361
commit 1d43400
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -259,7 +259,7 @@ jobs:
       - name: Run integration tests on upgraded network
         working-directory: ./tests/integration
         run: |
-          ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --junit-report ../../report-upgraded-integration.xml
+          ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --skip-file cli_defi_test.go --junit-report ../../report-upgraded-integration.xml
 
       - name: Upload post-upgrade integration tests result
         uses: actions/upload-artifact@v4
@@ -286,7 +286,7 @@ jobs:
       - name: Run pricing integration tests after successful param change proposal
         working-directory: ./tests/integration
         run: |
-          ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --skip-file cli_diddoc_test.go --skip-file cli_diddoc_negative_test.go --skip-file cli_resource_test.go --skip-file cli_resource_negative_test.go --junit-report ../../report-pricing-change.xml
+          ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --skip-file cli_diddoc_test.go --skip-file cli_diddoc_negative_test.go --skip-file cli_resource_test.go --skip-file cli_resource_negative_test.go --skip-file cli_defi_test.go --junit-report ../../report-pricing-change.xml
 
       - name: Upload pricing change tests result
         uses: actions/upload-artifact@v4

diff --git a/app/app.go b/app/app.go
@@ -1176,9 +1176,6 @@ func (app *App) setupUpgradeStoreLoaders() {
 }
 
 func ConfigureFeeMarketModule(ctx sdk.Context, keeper *feemarketkeeper.Keeper) error {
-	// initialise feemarket module
-	keeper.InitGenesis(ctx, *feemarkettypes.DefaultGenesisState())
-
 	// get feemarket params
 	params, err := keeper.GetParams(ctx)
 	if err != nil {
@@ -1192,8 +1189,6 @@ func ConfigureFeeMarketModule(ctx sdk.Context, keeper *feemarketkeeper.Keeper) e
 	params.MinBaseGasPrice = sdk.MustNewDecFromStr("0.5")
 	params.MaxBlockUtilization = feemarkettypes.DefaultMaxBlockUtilization
 
-	println("feemarket params", params.String())
-
 	// set feemarket params
 	if err := keeper.SetParams(ctx, params); err != nil {
 		return err
@@ -1208,8 +1203,6 @@ func ConfigureFeeMarketModule(ctx sdk.Context, keeper *feemarketkeeper.Keeper) e
 	// configure feemarket state
 	state.BaseGasPrice = sdk.MustNewDecFromStr("0.5")
 
-	println("feemarket state", state.String())
-
 	// set feemarket state
 	return keeper.SetState(ctx, state)
 }

diff --git a/tests/integration/cli_defi_test.go b/tests/integration/cli_defi_test.go
@@ -25,8 +25,8 @@ var _ = Describe("Upgrade - Burn coins from relevant message signer", func() {
 		// assert no error
 		Expect(err).To(BeNil())
 
-		// generate fixed fees, in which case 3,000,000,000 ncheq or 3 cheq
-		fees := helpers.GenerateFees("3000000000ncheq")
+		// generate fixed fees, in which case 3,500,000,000 ncheq or 3.5 cheq
+		fees := helpers.GenerateFees("3500000000ncheq")
 
 		// burn the coins
 		res, err := cli.BurnMsg(testdata.BASE_ACCOUNT_1, burnCoins.String(), fees)
@@ -63,8 +63,8 @@ var _ = Describe("Upgrade - Burn coins from relevant message signer", func() {
 		// assert no error
 		Expect(err).To(BeNil())
 
-		// generate fixed fees, in which case 3,000,000,000 ncheq or 3 cheq
-		fees := helpers.GenerateFees("3000000000ncheq")
+		// generate fixed fees, in which case 3,500,000,000 ncheq or 3.5 cheq
+		fees := helpers.GenerateFees("3500000000ncheq")
 
 		// burn the coins
 		res, err := cli.BurnMsg(testdata.BASE_ACCOUNT_3, coins.String(), fees)
@@ -94,18 +94,6 @@ var _ = Describe("Upgrade - Feemarket fees (non-taxable transactions)", func() {
 		// print the gas price
 		By("Gas Price: " + gasPrice.Price.String())
 
-		// query feemarket gas prices
-		gasPrices, err := cli.QueryFeemarketGasPrices()
-
-		// print the gas prices
-		By("Gas Prices: " + gasPrices.String())
-
-		// query feemarket params
-		params, err := cli.QueryFeemarketParams()
-
-		// print the params
-		By("Params: " + params.String())
-
 		// assert no error
 		Expect(err).To(BeNil())
 
@@ -139,18 +127,6 @@ var _ = Describe("Upgrade - Feemarket fees (non-taxable transactions)", func() {
 		// print the gas price
 		By("Gas Price: " + gasPrice.Price.String())
 
-		// query feemarket gas prices
-		gasPrices, err := cli.QueryFeemarketGasPrices()
-
-		// print the gas prices
-		By("Gas Prices: " + gasPrices.String())
-
-		// query feemarket params
-		params, err := cli.QueryFeemarketParams()
-
-		// print the params
-		By("Params: " + params.String())
-
 		// assert no error
 		Expect(err).To(BeNil())