Moved subscription backoff max and alert threshold to subscribe opts

Instead of defining those values per-contract we defined them only one
time now.

Author: pdyraga

pkg/chain/ethereum/ethutil/subscribe_opts.go

@@ -13,6 +13,22 @@ const (
 	// pulled from the chain by the subscription monitoring mechanism if no
 	// other value is provided in SubscribeOpts when creating the subscription.
 	DefaultSubscribeOptsPastBlocks = 100
+
+	// SubscriptionBackoffMax is the maximum backoff time between event
+	// resubscription attempts.
+	SubscriptionBackoffMax = 2 * time.Minute
+
+	// SubscriptionAlertThreshold is time threshold below which event
+	// resubscription emits an error to the logs.
+	// WS connection can be dropped at any moment and event resubscription will
+	// follow. However, if WS connection for event subscription is getting
+	// dropped too often, it may indicate something is wrong with Ethereum
+	// client. This constant defines the minimum lifetime of an event
+	// subscription required before the subscription failure happens and
+	// resubscription follows so that the resubscription does not emit an error
+	// to the logs alerting about potential problems with Ethereum client
+	// connection.
+	SubscriptionAlertThreshold = 15 * time.Minute
 )
 
 // SubscribeOpts specifies optional configuration options that can be passed

tools/generators/ethereum/contract.go.tmpl

@@ -26,21 +26,6 @@ import (
 // included or excluded from logging at startup by name.
 var {{.ShortVar}}Logger = log.Logger("keep-contract-{{.Class}}")
 
-const (
-    // Maximum backoff time between event resubscription attempts.
-    {{.ShortVar}}SubscriptionBackoffMax = 2 * time.Minute
-
-    // Threshold below which event resubscription emits an error to the logs.
-    // WS connection can be dropped at any moment and event resubscription will
-    // follow. However, if WS connection for event subscription is getting
-    // dropped too often, it may indicate something is wrong with Ethereum
-    // client. This constant defines the minimum lifetime of an event
-    // subscription required before the subscription failure happens and
-    // resubscription follows so that the resubscription does not emit an error
-    // to the logs alerting about potential problems with Ethereum client.
-    {{.ShortVar}}SubscriptionAlertThreshold = 15 * time.Minute
-)
-
 type {{.Class}} struct {
 	contract           *abi.{{.AbiClass}}
 	contractAddress    common.Address

tools/generators/ethereum/contract_events.go.tmpl

@@ -150,10 +150,10 @@ func ({{$contract.ShortVar}} *{{$contract.Class}}) watch{{$event.CapsName}}(
 		)
 	}
 
-	sub := ethutil.WithResubscription(
-		{{$contract.ShortVar}}SubscriptionBackoffMax,
+	return ethutil.WithResubscription(
+		ethutil.SubscriptionBackoffMax,
 		subscribeFn,
-		{{$contract.ShortVar}}SubscriptionAlertThreshold,
+		ethutil.SubscriptionAlertThreshold,
 		thresholdViolatedFn,
 		subscriptionFailedFn,
 	)

tools/generators/ethereum/contract_events_template_content.go

@@ -153,10 +153,10 @@ func ({{$contract.ShortVar}} *{{$contract.Class}}) watch{{$event.CapsName}}(
 		)
 	}
 
-	sub := ethutil.WithResubscription(
-		{{$contract.ShortVar}}SubscriptionBackoffMax,
+	return ethutil.WithResubscription(
+		ethutil.SubscriptionBackoffMax,
 		subscribeFn,
-		{{$contract.ShortVar}}SubscriptionAlertThreshold,
+		ethutil.SubscriptionAlertThreshold,
 		thresholdViolatedFn,
 		subscriptionFailedFn,
 	)

tools/generators/ethereum/contract_template_content.go

@@ -29,21 +29,6 @@ import (
 // included or excluded from logging at startup by name.
 var {{.ShortVar}}Logger = log.Logger("keep-contract-{{.Class}}")
 
-const (
-    // Maximum backoff time between event resubscription attempts.
-    {{.ShortVar}}SubscriptionBackoffMax = 2 * time.Minute
-
-    // Threshold below which event resubscription emits an error to the logs.
-    // WS connection can be dropped at any moment and event resubscription will
-    // follow. However, if WS connection for event subscription is getting
-    // dropped too often, it may indicate something is wrong with Ethereum
-    // client. This constant defines the minimum lifetime of an event
-    // subscription required before the subscription failure happens and
-    // resubscription follows so that the resubscription does not emit an error
-    // to the logs alerting about potential problems with Ethereum client.
-    {{.ShortVar}}SubscriptionAlertThreshold = 15 * time.Minute
-)
-
 type {{.Class}} struct {
 	contract           *abi.{{.AbiClass}}
 	contractAddress    common.Address