shutter-service: fix pre commit

Author: blockchainluffy

rolling-shutter/cmd/shutterservice/shutterservice.go

@@ -6,13 +6,14 @@ import (
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"github.com/spf13/cobra"
+
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
 	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration/command"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
-	"github.com/spf13/cobra"
 )
 
 func Cmd() *cobra.Command {

rolling-shutter/go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.1
 	github.com/rs/zerolog v1.28.0
+	github.com/shutter-network/contracts/v2 v2.0.0-beta.2.0.20241129172533-e843e747ddb1
 	github.com/shutter-network/gnosh-contracts v0.4.0
 	github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6
 	github.com/shutter-network/shutter/shlib v0.1.19
@@ -217,7 +218,6 @@ require (
 	github.com/rs/cors v1.9.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shutter-network/contracts/v2 v2.0.0-beta.2.0.20241129172533-e843e747ddb1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

rolling-shutter/keyperimpl/shutterservice/config.go

@@ -4,6 +4,7 @@ import (
 	"io"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprconfig"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
@@ -39,7 +40,7 @@ type Config struct {
 }
 
 func (c *Config) Validate() error {
-	//TODO: needs to be implemented
+	// TODO: needs to be implemented
 	return nil
 }
 
@@ -50,7 +51,7 @@ func (c *Config) Name() string {
 func (c *Config) SetDefaultValues() error {
 	c.HTTPEnabled = false
 	c.HTTPListenAddress = ":3000"
-	c.MaxNumKeysPerMessage = 500 //TODO: need to confirm on this
+	c.MaxNumKeysPerMessage = 500 // TODO: need to confirm on this
 	return nil
 }
 

rolling-shutter/keyperimpl/shutterservice/handlers.go

@@ -8,6 +8,7 @@ import (
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
@@ -28,7 +29,7 @@ func (h *DecryptionKeySharesHandler) MessagePrototypes() []p2pmsg.Message {
 }
 
 func (h *DecryptionKeySharesHandler) ValidateMessage(ctx context.Context, msg p2pmsg.Message) (pubsub.ValidationResult, error) {
-	//TODO: should we implement some check that this identity is to be decrypted even or not, or this can be taken care of by implementing triggered block in decTrigger?
+	// TODO: should we implement some check that this identity is to be decrypted even or not, or this can be taken care of by implementing triggered block in decTrigger?
 	keyShares := msg.(*p2pmsg.DecryptionKeyShares)
 	extra, ok := keyShares.Extra.(*p2pmsg.DecryptionKeyShares_Service)
 	if !ok {

rolling-shutter/keyperimpl/shutterservice/handlers_test.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	"gotest.tools/assert"
+
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
@@ -17,7 +19,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2pmsg"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
-	"gotest.tools/assert"
 )
 
 func TestHandleDecryptionKeySharesThresholdNotReached(t *testing.T) {

rolling-shutter/keyperimpl/shutterservice/keyper.go

@@ -9,6 +9,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	registryBindings "github.com/shutter-network/contracts/v2/bindings/shutterregistry"
+	"golang.org/x/exp/slog"
+
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/eonkeypublisher"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/epochkghandler"
@@ -20,7 +22,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
-	"golang.org/x/exp/slog"
 )
 
 var ErrParseKeyperSet = errors.New("cannot parse KeyperSet")
@@ -153,7 +154,7 @@ func (kpr *Keyper) initRegistrySyncer(ctx context.Context) error {
 		return err
 	}
 
-	//TODO: need to update go module after contract is finalised
+	// TODO: need to update go module after contract is finalised
 	kpr.registrySyncer = &RegistrySyncer{
 		Contract:             contract,
 		DBPool:               kpr.dbpool,
@@ -185,7 +186,7 @@ func (kpr *Keyper) processInputs(ctx context.Context) error {
 			err = kpr.processNewKeyperSet(ctx, ev)
 		case ev := <-kpr.newEonPublicKeys:
 			err = kpr.processNewEonPublicKey(ctx, ev)
-		//TODO: handle explicit decryption trigger, if needed
+		// TODO: handle explicit decryption trigger, if needed
 		case <-ctx.Done():
 			return ctx.Err()
 		}

rolling-shutter/keyperimpl/shutterservice/messagingmiddleware.go

@@ -9,6 +9,8 @@ import (
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"google.golang.org/protobuf/proto"
+
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/serviceztypes"
@@ -17,7 +19,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2pmsg"
-	"google.golang.org/protobuf/proto"
 )
 
 type MessagingMiddleware struct {
@@ -175,7 +176,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
 	ctx context.Context,
 	originalMsg *p2pmsg.DecryptionKeys,
 ) (p2pmsg.Message, error) {
-	//TODO: update flag in event table to notify the decryption is already done
+	// TODO: update flag in event table to notify the decryption is already done
 	if originalMsg.Extra != nil {
 		return originalMsg, nil
 	}

rolling-shutter/keyperimpl/shutterservice/newblock.go

@@ -9,6 +9,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+
 	obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/epochkghandler"

rolling-shutter/keyperimpl/shutterservice/newkeyperset.go

@@ -6,6 +6,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+
 	obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
 	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"

rolling-shutter/keyperimpl/shutterservice/registrysyncer.go

@@ -15,6 +15,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	registryBindings "github.com/shutter-network/contracts/v2/bindings/shutterregistry"
+
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
@@ -263,7 +264,7 @@ func (s *RegistrySyncer) insertIdentityRegisteredEvents(
 }
 
 func computeIdentity(event *registryBindings.ShutterregistryIdentityRegistered) []byte {
-	//TODO: may need to change this if we want to create identity other way
+	// TODO: may need to change this if we want to create identity other way
 	var buf bytes.Buffer
 	buf.Write(event.IdentityPrefix[:])
 	buf.Write(event.Sender.Bytes())