Guardian should be able to set disableHeartbeatVerify

node/pkg/node/options.go

@@ -71,6 +71,7 @@ func GuardianOptionP2P(p2pKey libp2p_crypto.PrivKey, networkId, bootstrapPeers,
 					g.obsvReqSendC.readC,
 					g.acct,
 					g.gov,
+					disableHeartbeatVerify,
 					components,
 					ibcFeaturesFunc,
 					(g.gatewayRelayer != nil), // gatewayRelayerEnabled,

node/pkg/p2p/run_params.go

@@ -38,7 +38,7 @@ type (
 		// WithChainGovernorStatusListener is optional and can be set with `WithChainGovernorStatusListener`.
 		signedGovSt chan *gossipv1.SignedChainGovernorStatus
 
-		// disableHeartbeatVerify is optional and can be set with `WithDisableHeartbeatVerify`.
+		// disableHeartbeatVerify is optional and can be set with `WithDisableHeartbeatVerify` or `WithGuardianOptions`.
 		disableHeartbeatVerify bool
 
 		// The following options are guardian specific. Set with `WithGuardianOptions`.
@@ -154,6 +154,7 @@ func WithGuardianOptions(
 	obsvReqSendC <-chan *gossipv1.ObservationRequest,
 	acct *accountant.Accountant,
 	gov *governor.ChainGovernor,
+	disableHeartbeatVerify bool,
 	components *Components,
 	ibcFeaturesFunc func() string,
 	gatewayRelayerEnabled bool,
@@ -174,6 +175,7 @@ func WithGuardianOptions(
 		p.obsvReqSendC = obsvReqSendC
 		p.acct = acct
 		p.gov = gov
+		p.disableHeartbeatVerify = disableHeartbeatVerify
 		p.components = components
 		p.ibcFeaturesFunc = ibcFeaturesFunc
 		p.gatewayRelayerEnabled = gatewayRelayerEnabled

node/pkg/p2p/run_params_test.go

@@ -148,6 +148,7 @@ func TestRunParamsWithGuardianOptions(t *testing.T) {
 
 	acct := &accountant.Accountant{}
 	gov := &governor.ChainGovernor{}
+	disableHeartbeatVerify := false
 	components := &Components{}
 	ibcFeaturesFunc := func() string { return "Hello, World!" }
 	gatewayRelayerEnabled := true
@@ -175,6 +176,7 @@ func TestRunParamsWithGuardianOptions(t *testing.T) {
 			obsvReqSendC,
 			acct,
 			gov,
+			disableHeartbeatVerify,
 			components,
 			ibcFeaturesFunc,
 			gatewayRelayerEnabled,

node/pkg/p2p/watermark_test.go

@@ -182,6 +182,7 @@ func startGuardian(t *testing.T, ctx context.Context, g *G) {
 			g.obsvReqSendC,
 			g.acct,
 			g.gov,
+			g.disableHeartbeatVerify,
 			g.components,
 			nil,   //g.ibcFeaturesFunc,
 			false, // gateway relayer enabled