use singleton boolean as feature gate

babylonlabs-io · Sep 4, 2024 · 6e06a7d · 6e06a7d
1 parent b00a4af
commit 6e06a7d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 76 deletions.
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -8403,8 +8403,6 @@ paths:
                       an unrelayed 
 
                       IBC packet becomes timeout, measured in seconds
-                  enable_integration:
-                    type: boolean
             description: >-
               QueryParamsResponse is the response type for the Query/Params RPC
               method.
@@ -12192,8 +12190,6 @@ definitions:
           unrelayed 
 
           IBC packet becomes timeout, measured in seconds
-      enable_integration:
-        type: boolean
     description: Params defines the parameters for the module.
   babylon.zoneconcierge.v1.ProofEpochSealed:
     type: object
@@ -14195,8 +14191,6 @@ definitions:
               unrelayed 
 
               IBC packet becomes timeout, measured in seconds
-          enable_integration:
-            type: boolean
     description: QueryParamsResponse is the response type for the Query/Params RPC method.
   tendermint.crypto.ProofOp:
     type: object

diff --git a/proto/babylon/zoneconcierge/v1/params.proto b/proto/babylon/zoneconcierge/v1/params.proto
@@ -13,7 +13,4 @@ message Params {
   // IBC packet becomes timeout, measured in seconds
   uint32 ibc_packet_timeout_seconds = 1
       [ (gogoproto.moretags) = "yaml:\"ibc_packet_timeout_seconds\"" ];
-
-  bool enable_integration = 2
-      [ (gogoproto.moretags) = "yaml:\"enable_integration\"" ];
 }
diff --git a/x/zoneconcierge/keeper/header_handler.go b/x/zoneconcierge/keeper/header_handler.go
@@ -12,7 +12,7 @@ import (
 // HandleHeaderWithValidCommit handles a CZ header with a valid QC
 func (k Keeper) HandleHeaderWithValidCommit(ctx context.Context, txHash []byte, header *types.HeaderInfo, isOnFork bool) {
 	// if integration is not enabled, do not process headers
-	if !k.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return
 	}
 

diff --git a/x/zoneconcierge/keeper/hooks.go b/x/zoneconcierge/keeper/hooks.go
@@ -23,7 +23,7 @@ func (k Keeper) Hooks() Hooks { return Hooks{k} }
 func (h Hooks) AfterEpochEnds(ctx context.Context, epoch uint64) {
 	// if integration is not enabled, do not trigger hooks
 	// NOTE: might not be needed, since the post handler is disabled
-	if !h.k.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return
 	}
 
@@ -37,7 +37,7 @@ func (h Hooks) AfterEpochEnds(ctx context.Context, epoch uint64) {
 func (h Hooks) AfterRawCheckpointSealed(ctx context.Context, epoch uint64) error {
 	// if integration is not enabled, do not trigger hooks
 	// NOTE: might not be needed, since the proofs do not depend on consumer chains
-	if !h.k.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return nil
 	}
 
@@ -51,7 +51,7 @@ func (h Hooks) AfterRawCheckpointSealed(ctx context.Context, epoch uint64) error
 // AfterRawCheckpointFinalized is triggered upon an epoch has been finalised
 func (h Hooks) AfterRawCheckpointFinalized(ctx context.Context, epoch uint64) error {
 	// if integration is not enabled, do not trigger hooks
-	if !h.k.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return nil
 	}
 

diff --git a/x/zoneconcierge/module_ibc.go b/x/zoneconcierge/module_ibc.go
@@ -34,7 +34,7 @@ func (im IBCModule) OnChanOpenInit(
 	counterparty channeltypes.Counterparty,
 	version string,
 ) (string, error) {
-	if !im.keeper.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return "", types.ErrIntegrationDisabled
 	}
 
@@ -73,7 +73,7 @@ func (im IBCModule) OnChanOpenTry(
 	counterparty channeltypes.Counterparty,
 	counterpartyVersion string,
 ) (string, error) {
-	if !im.keeper.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return "", types.ErrIntegrationDisabled
 	}
 
@@ -115,7 +115,7 @@ func (im IBCModule) OnChanOpenAck(
 	_,
 	counterpartyVersion string,
 ) error {
-	if !im.keeper.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return types.ErrIntegrationDisabled
 	}
 
@@ -133,7 +133,7 @@ func (im IBCModule) OnChanOpenConfirm(
 	portID,
 	channelID string,
 ) error {
-	if !im.keeper.GetParams(ctx).EnableIntegration {
+	if !types.EnableIntegration {
 		return types.ErrIntegrationDisabled
 	}
 

diff --git a/x/zoneconcierge/types/params.go b/x/zoneconcierge/types/params.go
@@ -4,6 +4,10 @@ import (
 	"fmt"
 )
 
+var (
+	EnableIntegration = false
+)
+
 const (
 	DefaultIbcPacketTimeoutSeconds uint32 = 60 * 60 * 24       // 24 hours
 	MaxIbcPacketTimeoutSeconds     uint32 = 60 * 60 * 24 * 365 // 1 year

diff --git a/x/zoneconcierge/types/params.pb.go b/x/zoneconcierge/types/params.pb.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,10 @@ import ( @@
     	"fmt"
     )
+    var (
+    	EnableIntegration = false
+    )
     const (
     	DefaultIbcPacketTimeoutSeconds uint32 = 60 * 60 * 24       // 24 hours
     	MaxIbcPacketTimeoutSeconds     uint32 = 60 * 60 * 24 * 365 // 1 year
@@ Expand Down @@