chore(release): Fix Deepsource error on development branch. (#1516)

* Fix Deepsource error.

* Fix lint issues.

Author: arijitAD

cmd/gossamer/account.go

@@ -118,7 +118,7 @@ func getKeystorePassword(ctx *cli.Context) []byte {
 // unlockKeystore compares the length of passwords to the length of accounts,
 // prompts the user for a password if no password is provided, and then unlocks
 // the accounts within the provided keystore
-func unlockKeystore(ks keystore.Keystore, basepath string, unlock string, password string) error {
+func unlockKeystore(ks keystore.Keystore, basepath, unlock, password string) error {
 	var passwords []string
 
 	if password != "" {

cmd/gossamer/main.go

@@ -378,7 +378,8 @@ func buildSpecAction(ctx *cli.Context) error {
 	if bs == nil {
 		return fmt.Errorf("error building genesis")
 	}
-	res := []byte{} //nolint
+
+	var res []byte
 	if ctx.Bool(RawFlag.Name) {
 		res, err = bs.ToJSONRaw()
 	} else {

cmd/gossamer/utils.go

@@ -75,7 +75,7 @@ func confirmMessage(msg string) bool {
 	fmt.Print("> ")
 	for {
 		text, _ := reader.ReadString('\n')
-		text = strings.Replace(text, "\n", "", -1)
+		text = strings.ReplaceAll(text, "\n", "")
 		return strings.Compare("Y", text) == 0
 	}
 }

dot/core/service_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime/extrinsic"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/transaction"
+	"github.com/ChainSafe/gossamer/lib/utils"
 	log "github.com/ChainSafe/log15"
 	"github.com/stretchr/testify/require"
 )
@@ -220,7 +221,7 @@ func TestHandleChainReorg_WithReorg_Transactions(t *testing.T) {
 			ParentHash: ancestor.Header.Hash(),
 			Number:     big.NewInt(0).Add(ancestor.Header.Number, big.NewInt(1)),
 			Digest: types.Digest{
-				newMockDigestItem(1),
+				utils.NewMockDigestItem(1),
 			},
 		},
 		Body: body,
@@ -374,7 +375,7 @@ func TestService_HandleSubmittedExtrinsic(t *testing.T) {
 	s := NewTestService(t, nil)
 
 	parentHash := common.MustHexToHash("0x35a28a7dbaf0ba07d1485b0f3da7757e3880509edc8c31d0850cb6dd6219361d")
-	header, err := types.NewHeader(parentHash, big.NewInt(1), common.Hash{}, common.Hash{}, types.NewEmptyDigest())
+	header, err := types.NewHeader(parentHash, common.Hash{}, common.Hash{}, big.NewInt(1), types.NewEmptyDigest())
 	require.NoError(t, err)
 
 	//initialize block header

dot/core/test_helpers.go

@@ -17,7 +17,6 @@
 package core
 
 import (
-	"io"
 	"io/ioutil"
 	"math/big"
 	"testing"
@@ -51,7 +50,7 @@ func newTestGenesisWithTrieAndHeader(t *testing.T) (*genesis.Genesis, *trie.Trie
 	genTrie, err := genesis.NewTrieFromGenesis(gen)
 	require.NoError(t, err)
 
-	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), big.NewInt(0), genTrie.MustHash(), trie.EmptyHash, types.Digest{})
+	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), genTrie.MustHash(), trie.EmptyHash, big.NewInt(0), types.Digest{})
 	require.NoError(t, err)
 	return gen, genTrie, genesisHeader
 }
@@ -263,32 +262,6 @@ func (s *mockSyncer) IsSynced() bool {
 
 func (s *mockSyncer) SetSyncing(bool) {}
 
-type mockDigestItem struct { //nolint
-	i int
-}
-
-func newMockDigestItem(i int) *mockDigestItem { //nolint
-	return &mockDigestItem{
-		i: i,
-	}
-}
-
-func (d *mockDigestItem) String() string { //nolint
-	return ""
-}
-
-func (d *mockDigestItem) Type() byte { //nolint
-	return byte(d.i)
-}
-
-func (d *mockDigestItem) Encode() ([]byte, error) { //nolint
-	return []byte{byte(d.i)}, nil
-}
-
-func (d *mockDigestItem) Decode(_ io.Reader) error { //nolint
-	return nil
-}
-
 type mockTransactionHandler struct{}
 
 func (h *mockTransactionHandler) HandleTransactionMessage(_ *network.TransactionMessage) error {

dot/network/sync.go

@@ -781,13 +781,7 @@ func (q *syncQueue) handleBlockAnnounceHandshake(blockNum uint32, from peer.ID)
 func (q *syncQueue) handleBlockAnnounce(msg *BlockAnnounceMessage, from peer.ID) {
 	q.updatePeerScore(from, 1)
 
-	header, err := types.NewHeader(
-		msg.ParentHash,
-		msg.Number,
-		msg.StateRoot,
-		msg.ExtrinsicsRoot,
-		msg.Digest,
-	)
+	header, err := types.NewHeader(msg.ParentHash, msg.StateRoot, msg.ExtrinsicsRoot, msg.Number, msg.Digest)
 	if err != nil {
 		logger.Error("failed to create header from BlockAnnounce", "error", err)
 		return

dot/node_test.go

@@ -222,7 +222,7 @@ func TestInitNode_LoadGenesisData(t *testing.T) {
 	genTrie, err := genesis.NewTrieFromGenesis(gen)
 	require.NoError(t, err)
 
-	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), big.NewInt(0), genTrie.MustHash(), trie.EmptyHash, types.Digest{})
+	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), genTrie.MustHash(), trie.EmptyHash, big.NewInt(0), types.Digest{})
 	require.NoError(t, err)
 
 	err = stateSrvc.Initialize(gen, genesisHeader, genTrie)
@@ -253,7 +253,7 @@ func TestInitNode_LoadGenesisData(t *testing.T) {
 	require.NoError(t, err)
 
 	stateRoot := genesisHeader.StateRoot
-	expectedHeader, err := types.NewHeader(common.NewHash([]byte{0}), big.NewInt(0), stateRoot, trie.EmptyHash, types.NewEmptyDigest())
+	expectedHeader, err := types.NewHeader(common.NewHash([]byte{0}), stateRoot, trie.EmptyHash, big.NewInt(0), types.NewEmptyDigest())
 	require.NoError(t, err)
 	require.Equal(t, expectedHeader.Hash(), genesisHeader.Hash())
 }

dot/rpc/helpers.go

@@ -34,8 +34,8 @@ func LocalhostFilter() *ipfilter.IPFilter {
 
 // LocalRequestOnly HTTP handler to restrict to only local connections
 func LocalRequestOnly(r *rpc.RequestInfo, i interface{}) error {
-	ip, _, error := net.SplitHostPort(r.Request.RemoteAddr)
-	if error != nil {
+	ip, _, err := net.SplitHostPort(r.Request.RemoteAddr)
+	if err != nil {
 		return errors.New("unable to parse IP")
 	}
 	f := LocalhostFilter()

dot/rpc/modules/chain.go

@@ -203,7 +203,7 @@ func (cm *ChainModule) unwindRequest(req interface{}) ([]string, error) {
 			if err != nil {
 				return nil, err
 			}
-			res = append(res, u[:]...)
+			res = append(res, u...)
 		}
 	case interface{}:
 		h, err := cm.lookupHashByInterface(x)

dot/rpc/modules/chain_test.go

@@ -315,7 +315,7 @@ func newTestGenesisWithTrieAndHeader() (*genesis.Genesis, *trie.Trie, *types.Hea
 		panic(err)
 	}
 
-	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), big.NewInt(0), genTrie.MustHash(), trie.EmptyHash, types.Digest{}) //nolint
+	genesisHeader, err := types.NewHeader(common.NewHash([]byte{0}), genTrie.MustHash(), trie.EmptyHash, big.NewInt(0), types.Digest{}) //nolint
 	if err != nil {
 		panic(err)
 	}