Merge pull request #474 from shutter-network/lint_fixes

Lint fixes

Author: fredo

rolling-shutter/contract/deployment/deployment.go

@@ -248,7 +248,12 @@ func (c *Contracts) getDeployment(name string) (*Deployment, error) {
 }
 
 func publishDeploymentMetric(d *Deployment) {
-	metricsContractDeploymentInfo.WithLabelValues(d.Name, d.Address.String(), strconv.FormatUint(d.ChainID, 10), strconv.FormatUint(d.DeployBlockNumber, 10)).Set(1)
+	metricsContractDeploymentInfo.WithLabelValues(
+		d.Name,
+		d.Address.String(),
+		strconv.FormatUint(d.ChainID, 10),
+		strconv.FormatUint(d.DeployBlockNumber, 10),
+	).Set(1)
 }
 
 func LoadDeployments(dir string) (*Deployments, error) {

rolling-shutter/keyper/epochkghandler/key.go

@@ -11,6 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 
+	"github.com/shutter-network/shutter/shlib/puredkg"
 	"github.com/shutter-network/shutter/shlib/shcrypto"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
@@ -72,9 +73,19 @@ func (handler *DecryptionKeyHandler) ValidateMessage(ctx context.Context, msg p2
 		return pubsub.ValidationReject, errors.New("no keys in message")
 	}
 	if len(key.Keys) > int(handler.config.GetMaxNumKeysPerMessage()) {
-		return pubsub.ValidationReject, errors.Errorf("too many keys in message (%d > %d)", len(key.Keys), handler.config.GetMaxNumKeysPerMessage())
+		return pubsub.ValidationReject, errors.Errorf(
+			"too many keys in message (%d > %d)",
+			len(key.Keys),
+			handler.config.GetMaxNumKeysPerMessage(),
+		)
 	}
-	for i, k := range key.Keys {
+
+	validationResult, err := checkKeysErrors(key.Keys, pureDKGResult)
+	return validationResult, err
+}
+
+func checkKeysErrors(keys []*p2pmsg.Key, pureDKGResult *puredkg.Result) (pubsub.ValidationResult, error) {
+	for i, k := range keys {
 		epochSecretKey, err := k.GetEpochSecretKey()
 		if err != nil {
 			return pubsub.ValidationReject, err
@@ -87,7 +98,7 @@ func (handler *DecryptionKeyHandler) ValidateMessage(ctx context.Context, msg p2
 			return pubsub.ValidationReject, errors.Errorf("epoch secret key for identity %x is not valid", k.Identity)
 		}
 
-		if i > 0 && bytes.Compare(k.Identity, key.Keys[i-1].Identity) < 0 {
+		if i > 0 && bytes.Compare(k.Identity, keys[i-1].Identity) < 0 {
 			return pubsub.ValidationReject, errors.Errorf("keys not ordered")
 		}
 	}

rolling-shutter/keyper/epochkghandler/keyshare.go

@@ -74,8 +74,18 @@ func (handler *DecryptionKeyShareHandler) ValidateMessage(ctx context.Context, m
 		return pubsub.ValidationReject, errors.New("no key shares in message")
 	}
 	if len(keyShare.Shares) > int(handler.config.GetMaxNumKeysPerMessage()) {
-		return pubsub.ValidationReject, errors.Errorf("too many key shares in message (%d > %d)", len(keyShare.Shares), handler.config.GetMaxNumKeysPerMessage())
+		return pubsub.ValidationReject, errors.Errorf(
+			"too many key shares in message (%d > %d)",
+			len(keyShare.Shares),
+			handler.config.GetMaxNumKeysPerMessage(),
+		)
 	}
+
+	validationResult, err := checkKeyShares(keyShare, pureDKGResult)
+	return validationResult, err
+}
+
+func checkKeyShares(keyShare *p2pmsg.DecryptionKeyShares, pureDKGResult *puredkg.Result) (pubsub.ValidationResult, error) {
 	shares := keyShare.GetShares()
 	for i, share := range shares {
 		epochSecretKeyShare, err := share.GetEpochSecretKeyShare()

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -102,24 +102,7 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 	messageSender.AddMessageHandler(&DecryptionKeysHandler{kpr.dbpool})
 	messagingMiddleware := NewMessagingMiddleware(messageSender, kpr.dbpool, kpr.config)
 
-	kpr.core, err = keyper.New(
-		&kprconfig.Config{
-			InstanceID:           kpr.config.InstanceID,
-			DatabaseURL:          kpr.config.DatabaseURL,
-			HTTPEnabled:          kpr.config.HTTPEnabled,
-			HTTPListenAddress:    kpr.config.HTTPListenAddress,
-			P2P:                  kpr.config.P2P,
-			Ethereum:             kpr.config.Gnosis.Node,
-			Shuttermint:          kpr.config.Shuttermint,
-			Metrics:              kpr.config.Metrics,
-			MaxNumKeysPerMessage: kpr.config.MaxNumKeysPerMessage,
-		},
-		kpr.decryptionTriggerChannel,
-		keyper.WithDBPool(kpr.dbpool),
-		keyper.NoBroadcastEonPublicKey(),
-		keyper.WithEonPublicKeyHandler(kpr.channelNewEonPublicKey),
-		keyper.WithMessaging(messagingMiddleware),
-	)
+	kpr.core, err = NewKeyper(kpr, messagingMiddleware)
 	if err != nil {
 		return errors.Wrap(err, "can't instantiate keyper core")
 	}
@@ -175,6 +158,28 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 	return runner.StartService(kpr.core, kpr.chainSyncClient, kpr.slotTicker, kpr.eonKeyPublisher)
 }
 
+func NewKeyper(kpr *Keyper, messagingMiddleware *MessagingMiddleware) (*keyper.KeyperCore, error) {
+	core, err := keyper.New(
+		&kprconfig.Config{
+			InstanceID:           kpr.config.InstanceID,
+			DatabaseURL:          kpr.config.DatabaseURL,
+			HTTPEnabled:          kpr.config.HTTPEnabled,
+			HTTPListenAddress:    kpr.config.HTTPListenAddress,
+			P2P:                  kpr.config.P2P,
+			Ethereum:             kpr.config.Gnosis.Node,
+			Shuttermint:          kpr.config.Shuttermint,
+			Metrics:              kpr.config.Metrics,
+			MaxNumKeysPerMessage: kpr.config.MaxNumKeysPerMessage,
+		},
+		kpr.decryptionTriggerChannel,
+		keyper.WithDBPool(kpr.dbpool),
+		keyper.NoBroadcastEonPublicKey(),
+		keyper.WithEonPublicKeyHandler(kpr.channelNewEonPublicKey),
+		keyper.WithMessaging(messagingMiddleware),
+	)
+	return core, err
+}
+
 // initSequencerSycer initializes the sequencer syncer if the keyper is known to be a member of a
 // keyper set. Otherwise, the syncer will only be initialized once such a keyper set is observed to
 // be added, as only then we will know which eon(s) we are responsible for.

rolling-shutter/p2p/params.go

@@ -19,7 +19,8 @@ func makePubSubParams(
 	gossipSubParams := &gsDefault
 
 	// modified defaults from ethereum consensus spec
-	// https://github.com/ethereum/consensus-specs/blob/5d80b1954a4b7a121aa36143d50b366727b66cbc/specs/phase0/p2p-interface.md#why-are-these-specific-gossip-parameters-chosen //nolint:lll
+	// https://github.com/ethereum/consensus-specs/blob/5d80b1954a4b7a121aa36143d50b366727b66cbc/\
+	//   specs/phase0/p2p-interface.md#why-are-these-specific-gossip-parameters-chosen //nolint:lll
 	gossipSubParams.HeartbeatInterval = 700 * time.Millisecond
 	gossipSubParams.HistoryLength = 6