chore: move getClientVerstion to medley chainsync

Author: blockchainluffy

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -3,11 +3,11 @@ package keypermetrics
 import (
 	"context"
 
-	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rs/zerolog/log"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprconfig"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
 )
 
 var MetricsKeyperCurrentBlockL1 = prometheus.NewGauge(
@@ -95,9 +95,10 @@ func InitMetrics(config *kprconfig.Config) {
 	prometheus.MustRegister(MetricsKeyperCurrentBatchConfigIndex)
 	prometheus.MustRegister(MetricsKeyperBatchConfigInfo)
 
-	version, err := getClientVersion(config.Ethereum.EthereumURL)
+	version, err := chainsync.GetClientVersion(context.Background(), config.Ethereum.EthereumURL)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to get execution client version")
+		log.Error().Err(err).Msg("execution_client_version metrics | Failed to get execution client version")
+		return
 	}
 
 	executionClientVersion := prometheus.NewGauge(
@@ -113,13 +114,3 @@ func InitMetrics(config *kprconfig.Config) {
 	)
 	prometheus.MustRegister(executionClientVersion)
 }
-
-func getClientVersion(rpcURL string) (string, error) {
-	client, err := rpc.DialContext(context.Background(), rpcURL)
-	if err != nil {
-		return "", err
-	}
-	var version string
-	err = client.CallContext(context.Background(), &version, "web3_clientVersion")
-	return version, err
-}

rolling-shutter/keyperimpl/gnosis/metrics.go

@@ -104,7 +104,8 @@ func init() {
 func InitMetrics(beaconClient *beaconapiclient.Client) {
 	version, err := beaconClient.GetBeaconNodeVersion(context.Background())
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to get beacon node version")
+		log.Error().Err(err).Msg("beacon_client_version metrics | Failed to get beacon node version")
+		return
 	}
 	beaconClientVersion := prometheus.NewGauge(
 		prometheus.GaugeOpts{

rolling-shutter/medley/chainsync/client.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 	"github.com/shutter-network/shop-contracts/bindings"
 
@@ -148,3 +149,13 @@ func (s *Client) ChainID(ctx context.Context) (*big.Int, error) {
 func (s *Client) Start(_ context.Context, runner service.Runner) error {
 	return runner.StartService(s.getServices()...)
 }
+
+func GetClientVersion(ctx context.Context, ethereumURL string) (string, error) {
+	client, err := rpc.DialContext(ctx, ethereumURL)
+	if err != nil {
+		return "", err
+	}
+	var version string
+	err = client.CallContext(ctx, &version, "web3_clientVersion")
+	return version, err
+}