Merge pull request #525 from shutter-network/fix-linting-errors

ulope · web-flow · commit 2bffa3d615f5 · 2024-10-21T14:15:41.000+02:00
Fix remaining linting errors
diff --git a/rolling-shutter/app/app.go b/rolling-shutter/app/app.go
@@ -211,7 +211,7 @@ where one DeliverTx is called for each transaction in the block. The result is a
 application state. Cryptographic commitments to the results of DeliverTx, EndBlock, and Commit are
 included in the header of the next block.
 */
-func (app *ShutterApp) InitChain(req abcitypes.RequestInitChain) abcitypes.ResponseInitChain {
+func (app *ShutterApp) InitChain(req abcitypes.RequestInitChain) abcitypes.ResponseInitChain { //nolint:unparam
 	genesisState := GenesisAppState{}
 	err := amino.NewCodec().UnmarshalJSON(req.AppStateBytes, &genesisState)
 	if err != nil {
@@ -841,7 +841,7 @@ func (app *ShutterApp) maybePersistToDisk() error {
 	return app.PersistToDisk()
 }
 
-func (app *ShutterApp) Commit() abcitypes.ResponseCommit {
+func (app *ShutterApp) Commit() abcitypes.ResponseCommit { //nolint:unparam
 	app.CheckTxState.Reset()
 
 	err := app.maybePersistToDisk()
diff --git a/rolling-shutter/app/dkg_test.go b/rolling-shutter/app/dkg_test.go
@@ -10,7 +10,7 @@ import (
 
 var polyEval = []*big.Int{new(big.Int).SetBytes([]byte{})}
 
-func TestRegisterMsgs(t *testing.T) {
+func TestRegisterMsgs(t *testing.T) { //nolint:funlen
 	eon := uint64(10)
 	keypers := []common.Address{}
 	for i := 0; i < 3; i++ {
diff --git a/rolling-shutter/cmd/cryptocmd/cryptocmd.go b/rolling-shutter/cmd/cryptocmd/cryptocmd.go
@@ -139,7 +139,7 @@ func encrypt(msg string) error {
 
 	msgBytes := []byte(msg)
 	encryptedMsg := shcrypto.Encrypt(msgBytes, eonKey, epochIDPoint, sigma)
-	fmt.Println("0x" + hex.EncodeToString(encryptedMsg.Marshal()))
+	fmt.Println("0x" + hex.EncodeToString(encryptedMsg.Marshal())) //nolint:goconst
 	return nil
 }
 
diff --git a/rolling-shutter/cmd/cryptocmd/jsontests.go b/rolling-shutter/cmd/cryptocmd/jsontests.go
@@ -314,7 +314,7 @@ var testSpecs = []struct {
 	},
 }
 
-func createJSONTests(enc testEncoder) {
+func createJSONTests(enc testEncoder) { //nolint:gocyclo
 	keys, err := testkeygen.NewEonKeys(rand.Reader, 12, 10)
 	if err != nil {
 		panic(err)
diff --git a/rolling-shutter/collator/batchhandler/sequencer/mockethserver.go b/rolling-shutter/collator/batchhandler/sequencer/mockethserver.go
diff --git a/rolling-shutter/collator/collator.go b/rolling-shutter/collator/collator.go
diff --git a/rolling-shutter/gnosisaccessnode/config.go b/rolling-shutter/gnosisaccessnode/config.go
@@ -46,7 +46,7 @@ func (c *Config) SetDefaultValues() error {
 	return nil
 }
 
-func (c *Config) SetExampleValues() error { //nolint:unparam
+func (c *Config) SetExampleValues() error {
 	err := c.SetDefaultValues()
 	if err != nil {
 		return err
diff --git a/rolling-shutter/keyper/epochkghandler/keyshare_test.go b/rolling-shutter/keyper/epochkghandler/keyshare_test.go
@@ -87,7 +87,7 @@ func TestHandleDecryptionKeyShareIntegration(t *testing.T) {
 	}
 }
 
-func TestDecryptionKeyshareValidatorIntegration(t *testing.T) {
+func TestDecryptionKeyshareValidatorIntegration(t *testing.T) { //nolint:funlen
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
diff --git a/rolling-shutter/keyper/kprapi/http.go b/rolling-shutter/keyper/kprapi/http.go
@@ -62,7 +62,7 @@ func (srv *Server) GetDecryptionKey(w http.ResponseWriter, r *http.Request, eon
 		return
 	}
 
-	res := "0x" + hex.EncodeToString(decryptionKey.DecryptionKey)
+	res := "0x" + hex.EncodeToString(decryptionKey.DecryptionKey) //nolint:goconst
 	w.Header().Set("Content-Type", "application/json")
 	_ = json.NewEncoder(w).Encode(res)
 }
diff --git a/rolling-shutter/medley/configuration/command/command.go b/rolling-shutter/medley/configuration/command/command.go
@@ -62,7 +62,7 @@ func NewConfigForFunc[T configuration.Config](fn ConfigurableFunc[T]) T {
 // The configuration parsing is inferred by main's only argument, which
 // has to be a configuration struct that complies with the configuration.Config
 // interface.
-func Build[T configuration.Config](
+func Build[T configuration.Config]( //nolint:funlen
 	main ConfigurableFunc[T],
 	options ...Option,
 ) *CommandBuilder[T] {
diff --git a/rolling-shutter/medley/configuration/test/helper.go b/rolling-shutter/medley/configuration/test/helper.go
@@ -61,7 +61,7 @@ func SmokeGenerateConfig[T configuration.Config](
 	afs := afero.NewMemMapFs()
 	v.SetFs(afs)
 
-	configFile := dirPath + config.Name() + ".toml"
+	configFile := dirPath + config.Name()
 	err := afs.MkdirAll(dirPath, os.ModeDir)
 	assert.NilError(t, err)
 
diff --git a/rolling-shutter/medley/encodeable/keys/ed25519.go b/rolling-shutter/medley/encodeable/keys/ed25519.go
@@ -47,8 +47,7 @@ type Ed25519Private struct {
 func (k *Ed25519Private) Public() Public {
 	pub, ok := k.Key.Public().(ed25519.PublicKey)
 	if !ok {
-		panic("crypto/ed25519's Public() did return unexpected type, " +
-			"indicating an upstream API change")
+		panic(makeUpstreamAPIChangeMessage("crypto/ed25519's Public()"))
 	}
 	return &Ed25519Public{Key: pub}
 }
diff --git a/rolling-shutter/medley/encodeable/keys/libp2p.go b/rolling-shutter/medley/encodeable/keys/libp2p.go
@@ -30,6 +30,10 @@ var (
 	errFailedMarshalLibp2pPublic    error = errors.New("failed to marshal Libp2pPublic key")
 )
 
+func makeUpstreamAPIChangeMessage(name string) string {
+	return name + " did return unexpected type, indicating an upstream API change"
+}
+
 func NewLibp2pPrivate(b []byte) (*Libp2pPrivate, error) {
 	// We have to do all of this only because libp2p did decide to make the
 	// underlying key member private, not provide a simple constructor and
@@ -49,8 +53,7 @@ func NewLibp2pPrivate(b []byte) (*Libp2pPrivate, error) {
 	if !ok {
 		panic(errors.Wrap(
 			errFailedUnmarshalLibp2pPrivate,
-			"libp2p's UnmarshalEd25519PrivateKey() did return unexpected type, "+
-				"indicating an upstream API change",
+			makeUpstreamAPIChangeMessage("libp2p's UnmarshalEd25519PrivateKey()"),
 		))
 	}
 	return &Libp2pPrivate{
@@ -66,10 +69,7 @@ func (k *Libp2pPrivate) Public() Public {
 	pub := k.Key.GetPublic()
 	edPubK, ok := pub.(*crypto.Ed25519PublicKey)
 	if !ok {
-		panic(errors.New(
-			"libp2p's GetPublic() did return unexpected type, " +
-				"indicating an upstream API change",
-		))
+		panic(errors.New(makeUpstreamAPIChangeMessage("libp2p's GetPublic()")))
 	}
 	return &Libp2pPublic{Key: *edPubK}
 }
@@ -115,9 +115,8 @@ func (k *Libp2pPrivate) UnmarshalText(b []byte) error {
 	if !ok {
 		panic(errors.Wrap(
 			errFailedUnmarshalLibp2pPrivate,
-			"libp2p's UnmarshalPrivateKey() did return unexpected type, "+
-				"indicating an upstream API change",
-		))
+			makeUpstreamAPIChangeMessage("libp2p's UnmarshalPrivateKey()")),
+		)
 	}
 	k.Key = *edPk
 	return nil
@@ -159,8 +158,7 @@ func NewLibp2pPublic(b []byte) (*Libp2pPublic, error) {
 	if !ok {
 		panic(errors.Wrap(
 			errFailedUnmarshalLibp2pPrivate,
-			"libp2p's UnmarshalEd25519PublicKey() did return unexpected type, "+
-				"indicating an upstream API change",
+			makeUpstreamAPIChangeMessage("libp2p's UnmarshalEd25519PublicKey()"),
 		))
 	}
 	return &Libp2pPublic{
@@ -210,9 +208,7 @@ func (k *Libp2pPublic) UnmarshalText(b []byte) error {
 	if !ok {
 		panic(errors.Wrap(
 			errFailedUnmarshalLibp2pPublic,
-			"libp2p's UnmarshalPublicKey() did return unexpected type, "+
-				"indicating an upstream API change",
-		))
+			makeUpstreamAPIChangeMessage("libp2p's UnmarshalPublicKey()")))
 	}
 	k.Key = *edPubK
 	return nil
diff --git a/rolling-shutter/medley/metricsserver/config.go b/rolling-shutter/medley/metricsserver/config.go
@@ -43,6 +43,6 @@ func (mc *MetricsConfig) SetExampleValues() error {
 	return nil
 }
 
-func (mc *MetricsConfig) TOMLWriteHeader(w io.Writer) (int, error) {
+func (mc *MetricsConfig) TOMLWriteHeader(_ io.Writer) (int, error) {
 	return 0, nil
 }
diff --git a/rolling-shutter/p2p/config.go b/rolling-shutter/p2p/config.go
@@ -44,7 +44,7 @@ func (c *Config) Init() {
 type Config struct {
 	P2PKey                   *keys.Libp2pPrivate `shconfig:",required"`
 	ListenAddresses          []*address.P2PAddress
-	AdvertiseAddresses       []*address.P2PAddress `comment:"Optional, addresses to be advertised to other peers instead of auto-detected ones."`
+	AdvertiseAddresses       []*address.P2PAddress `comment:"Optional, addresses to be advertised to other peers instead of auto-detected ones."` //nolint:lll
 	CustomBootstrapAddresses []*address.P2PAddress `comment:"Overwrite p2p boostrap nodes"`
 	Environment              env.Environment
 	DiscoveryNamespace       string                  `shconfig:",required" comment:"Must be unique for each instance id."`
diff --git a/rolling-shutter/p2p/dht_test.go b/rolling-shutter/p2p/dht_test.go
@@ -21,5 +21,5 @@ func TestRandomisePeers(t *testing.T) {
 	randomisedPeers := randomizePeers(peerAddr)
 
 	equal := reflect.DeepEqual(peerAddr, randomisedPeers)
-	assert.Assert(t, !equal, "randomised unsuccessful")
+	assert.Assert(t, !equal, "randomized unsuccessful")
 }
diff --git a/rolling-shutter/p2p/messaging.go b/rolling-shutter/p2p/messaging.go
@@ -155,7 +155,7 @@ type P2PMessaging struct {
 // P2PMessage interface, processes it and returns a slice of resulting P2PMessages.
 // If the handler is registered on the P2Phandler via the AddHandlerFunc function,
 // the passed in handler will be called automatically when a message of type M is received,
-// AFTER it has been successefully validated by the ValidatorFunc, if one is registered on the P2PHandler
+// AFTER it has been successefully validated by the ValidatorFunc, if one is registered on the P2PHandler.
 func (m *P2PMessaging) AddHandlerFunc(handlerFunc HandlerFunc, protos ...p2pmsg.Message) {
 	for _, p := range protos {
 		messageType := proto.MessageName(p)
diff --git a/rolling-shutter/p2p/p2p_test.go b/rolling-shutter/p2p/p2p_test.go
@@ -25,7 +25,7 @@ func init() {
 var ErrTestComplete = errors.New("test complete")
 
 // TestStartNetworkNode test that we can init two p2p nodes and make them send/receive messages.
-func TestStartNetworkNodeIntegration(t *testing.T) {
+func TestStartNetworkNodeIntegration(t *testing.T) { //nolint:funlen
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
diff --git a/rolling-shutter/p2pnode/host.go b/rolling-shutter/p2pnode/host.go
@@ -47,7 +47,7 @@ func New(config *Config) *P2PNode {
 	}
 }
 
-func (node *P2PNode) Start(ctx context.Context, runner service.Runner) error {
+func (node *P2PNode) Start(_ context.Context, runner service.Runner) error {
 	services := []service.Service{}
 
 	p2pHandler, err := p2p.New(node.config.P2P)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func encrypt(msg string) error {`
`139`	`139`
`140`	`140`	`msgBytes := []byte(msg)`
`141`	`141`	`encryptedMsg := shcrypto.Encrypt(msgBytes, eonKey, epochIDPoint, sigma)`
`142`		`- fmt.Println("0x" + hex.EncodeToString(encryptedMsg.Marshal()))`
	`142`	`+ fmt.Println("0x" + hex.EncodeToString(encryptedMsg.Marshal())) //nolint:goconst`
`143`	`143`	`return nil`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ var testSpecs = []struct {`
`314`	`314`	`},`
`315`	`315`	`}`
`316`	`316`
`317`		`-func createJSONTests(enc testEncoder) {`
	`317`	`+func createJSONTests(enc testEncoder) { //nolint:gocyclo`
`318`	`318`	`keys, err := testkeygen.NewEonKeys(rand.Reader, 12, 10)`
`319`	`319`	`if err != nil {`
`320`	`320`	`panic(err)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (c *Config) SetDefaultValues() error {`
`46`	`46`	`return nil`
`47`	`47`	`}`
`48`	`48`
`49`		`-func (c *Config) SetExampleValues() error { //nolint:unparam`
	`49`	`+func (c *Config) SetExampleValues() error {`
`50`	`50`	`err := c.SetDefaultValues()`
`51`	`51`	`if err != nil {`
`52`	`52`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func TestHandleDecryptionKeyShareIntegration(t *testing.T) {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-func TestDecryptionKeyshareValidatorIntegration(t *testing.T) {`
	`90`	`+func TestDecryptionKeyshareValidatorIntegration(t *testing.T) { //nolint:funlen`
`91`	`91`	`if testing.Short() {`
`92`	`92`	`t.Skip("skipping integration test")`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (srv Server) GetDecryptionKey(w http.ResponseWriter, r http.Request, eon`
`62`	`62`	`return`
`63`	`63`	`}`
`64`	`64`
`65`		`- res := "0x" + hex.EncodeToString(decryptionKey.DecryptionKey)`
	`65`	`+ res := "0x" + hex.EncodeToString(decryptionKey.DecryptionKey) //nolint:goconst`
`66`	`66`	`w.Header().Set("Content-Type", "application/json")`
`67`	`67`	`_ = json.NewEncoder(w).Encode(res)`
`68`	`68`	`}`