refactor: avoid breaking change due to #16415 included in v0.50 (#16430)

(cherry picked from commit dda81a2)

# Conflicts:
#	baseapp/msg_service_router.go

baseapp/circuit.go

@@ -1,10 +1,8 @@
 package baseapp
 
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
+import "context"
 
 // CircuitBreaker is an interface that defines the methods for a circuit breaker.
 type CircuitBreaker interface {
-	IsAllowed(ctx sdk.Context, typeURL string) bool
+	IsAllowed(ctx context.Context, typeURL string) (bool, error)
 }

baseapp/msg_service_router.go

@@ -126,11 +126,24 @@ func (msr *MsgServiceRouter) RegisterService(sd *grpc.ServiceDesc, handler inter
 					return nil, err
 				}
 
+<<<<<<< HEAD
 				if msr.circuitBreaker != nil {
 					msgURL := sdk.MsgTypeURL(req)
 					if !msr.circuitBreaker.IsAllowed(ctx, msgURL) {
 						return nil, fmt.Errorf("circuit breaker disables execution of this message: %s", msgURL)
 					}
+=======
+			if msr.circuitBreaker != nil {
+				msgURL := sdk.MsgTypeURL(req)
+
+				isAllowed, err := msr.circuitBreaker.IsAllowed(ctx, msgURL)
+				if err != nil {
+					return nil, err
+				}
+
+				if !isAllowed {
+					return nil, fmt.Errorf("circuit breaker disables execution of this message: %s", msgURL)
+>>>>>>> dda81a227 (refactor: avoid breaking change due to #16415 included in v0.50 (#16430))
 				}
 			}
 			// Call the method handler from the service description with the handler object.