Merge branch 'main' into dependabot/go_modules/golang.org/x/crypto-0.…

…31.0
cosmos · Dec 13, 2024 · 2bd979a · 2bd979a
2 parents b7d0117 + b7a14d8
commit 2bd979a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/tests/integration/unbonding.go b/tests/integration/unbonding.go
@@ -50,7 +50,9 @@ func (s *CCVTestSuite) TestUndelegationCompletion() {
 func (s *CCVTestSuite) TestConsumerUnjailNoOp() {
 	consumerKeeper := s.consumerApp.GetConsumerKeeper()
 
-	// this is a no-op
-	err := consumerKeeper.Unjail(s.consumerCtx(), sdk.ConsAddress([]byte{0x01, 0x02, 0x03}))
-	s.Require().NoError(err)
+	if s.consumerApp.GetStakingKeeper() == nil {
+		// this is a no-op
+		err := consumerKeeper.Unjail(s.consumerCtx(), sdk.ConsAddress([]byte{0x01, 0x02, 0x03}))
+		s.Require().NoError(err)
+	}
 }