fix: Optimise sleep and wait functions in upgrade tests [DEV-5514] & Optimise sleep funtions in fee abs tests [DEV-5515] (#942)

* optimized sleep and wait functions in tests

* revert wait time

Author: kaustubhkapatral

tests/fee-abs/fee-abs-test.sh

@@ -82,7 +82,7 @@ docker compose exec -d osmosis osmosisd start
 
 info "Waiting for chains"
 # TODO: Get rid of this
-sleep 20
+sleep 10
 
 info "Checking statuses"
 CHEQD_STATUS=$(docker compose exec cheqd cheqd-noded status 2>&1)
@@ -211,7 +211,7 @@ RES=$(docker compose exec cheqd cheqd-noded tx feeabs fund 200000000000000000nch
 assert_tx_successful "${RES}"
 
 info "wait for exchange rate to be updated"
-sleep 600
+sleep 150
 
 info "pay fees using osmo in cheqd (recursively)"
 # shellcheck disable=SC2034

tests/upgrade/integration/v4/param_change_proposal_test.go

@@ -43,7 +43,7 @@ var _ = Describe("Upgrade - Fee parameter change proposal", func() {
 		Expect(err).To(BeNil())
 
 		By("waiting for the proposal to be included in a block")
-		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+2, cli.VotingPeriod*3)
+		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+2, cli.VotingPeriod*1)
 		Expect(err).To(BeNil())
 	})
 
@@ -81,7 +81,7 @@ var _ = Describe("Upgrade - Fee parameter change proposal", func() {
 		Expect(err).To(BeNil())
 
 		By("waiting for the proposal to pass")
-		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*2)
+		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*1)
 		Expect(err).To(BeNil())
 	})
 
@@ -129,7 +129,7 @@ var _ = Describe("Upgrade - Fee parameter change proposal", func() {
 		Expect(err).To(BeNil())
 
 		By("waiting for the proposal to be included in a block")
-		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+2, cli.VotingPeriod*2)
+		err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+2, cli.VotingPeriod*1)
 		Expect(err).To(BeNil())
 	})
 

tests/upgrade/integration/v4/post_test.go

@@ -50,7 +50,7 @@ var _ = Describe("Upgrade - Post", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top, after the upgrade")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*6)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*2)
 			Expect(err).To(BeNil())
 		})
 
@@ -83,7 +83,7 @@ var _ = Describe("Upgrade - Post", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top")
-			err = cli.WaitForChainHeight(cli.Validator2, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*8)
+			err = cli.WaitForChainHeight(cli.Validator2, cli.CliBinaryName, currentHeight+10, cli.VotingPeriod*2)
 			Expect(err).To(BeNil())
 		})
 

tests/upgrade/integration/v4/pre_test.go

@@ -39,7 +39,7 @@ var _ = Describe("Upgrade - Pre", func() {
 	Context("Before a software upgrade execution is initiated", func() {
 		It("should wait for chain to bootstrap", func() {
 			By("pinging the node status until the voting end height is reached")
-			err := cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, cli.BootstrapHeight, cli.BootstrapPeriod+20)
+			err := cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, cli.BootstrapHeight, cli.BootstrapPeriod+5)
 			Expect(err).To(BeNil())
 		})
 
@@ -67,7 +67,7 @@ var _ = Describe("Upgrade - Pre", func() {
 				By("waiting for an additional set of blocks to be produced")
 				height, err := cli.GetCurrentBlockHeight(cli.Validator0, cli.CliBinaryName)
 				Expect(err).To(BeNil())
-				err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, height+5, cli.VotingPeriod*6)
+				err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, height+5, cli.VotingPeriod*2)
 				Expect(err).To(BeNil())
 			}
 		})
@@ -107,7 +107,7 @@ var _ = Describe("Upgrade - Pre", func() {
 				By("waiting for an additional set of blocks to be produced")
 				height, err := cli.GetCurrentBlockHeight(cli.Validator0, cli.CliBinaryName)
 				Expect(err).To(BeNil())
-				err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, height+5, cli.VotingPeriod*6)
+				err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, height+5, cli.VotingPeriod*2)
 				Expect(err).To(BeNil())
 			}
 		})
@@ -137,7 +137,7 @@ var _ = Describe("Upgrade - Pre", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top, after the upgrade")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+3, cli.VotingPeriod*3)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+3, cli.VotingPeriod*1)
 			Expect(err).To(BeNil())
 		})
 
@@ -154,7 +154,7 @@ var _ = Describe("Upgrade - Pre", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for the proposal to be included in a block")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+3, cli.VotingPeriod*3)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+3, cli.VotingPeriod*1)
 			Expect(err).To(BeNil())
 		})
 
@@ -171,7 +171,7 @@ var _ = Describe("Upgrade - Pre", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top, after the upgrade")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*2)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*1)
 			Expect(err).To(BeNil())
 		})
 
@@ -188,7 +188,7 @@ var _ = Describe("Upgrade - Pre", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top, after the upgrade")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*2)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*1)
 			Expect(err).To(BeNil())
 		})
 
@@ -205,7 +205,7 @@ var _ = Describe("Upgrade - Pre", func() {
 			Expect(err).To(BeNil())
 
 			By("waiting for 10 blocks to be produced on top, after the upgrade")
-			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*2)
+			err = cli.WaitForChainHeight(cli.Validator0, cli.CliBinaryName, currentHeight+1, cli.VotingPeriod*1)
 			Expect(err).To(BeNil())
 		})