Fix lint

sourcenetwork · Mar 4, 2025 · a6dbb68 · a6dbb68
1 parent b4597ce
commit a6dbb68
Show file tree

Hide file tree

Showing 21 changed files with 107 additions and 77 deletions.
diff --git a/acp/identity/identity.go b/acp/identity/identity.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/cyware/ssi-sdk/crypto"
 	"github.com/cyware/ssi-sdk/did/key"
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/lestrrat-go/jwx/v2/jws"
 	"github.com/lestrrat-go/jwx/v2/jwt"

diff --git a/acp/identity/identity_test.go b/acp/identity/identity_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/cyware/ssi-sdk/crypto"
 	"github.com/cyware/ssi-sdk/did/key"
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/acp/identity/raw_identity.go b/acp/identity/raw_identity.go
@@ -13,7 +13,7 @@ package identity
 import (
 	"encoding/hex"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 )
 
 // RawIdentity holds the raw bytes that make up an actor's identity.

diff --git a/cli/start.go b/cli/start.go
@@ -15,7 +15,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/sourcenetwork/immutable"
 	"github.com/spf13/cobra"
 

diff --git a/cli/utils.go b/cli/utils.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/sourcenetwork/immutable"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -14,7 +14,7 @@ import (
 	"crypto/ed25519"
 	"crypto/rand"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 )
 
 // GenerateSecp256k1 generates a new secp256k1 private key.

diff --git a/crypto/signature_test.go b/crypto/signature_test.go
@@ -1,11 +1,21 @@
+// Copyright 2025 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
 package crypto
 
 import (
 	"crypto/ed25519"
 	"crypto/sha256"
 	"testing"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -140,12 +150,12 @@ func TestVerify_TamperedMessage(t *testing.T) {
 	tests := []struct {
 		name      string
 		sigType   SignatureType
-		setupKeys func(t *testing.T) (pubKey, privKey interface{})
+		setupKeys func(t *testing.T) (pubKey, privKey any)
 	}{
 		{
 			name:    "ECDSA tampered message",
 			sigType: SignatureTypeECDSA256K,
-			setupKeys: func(t *testing.T) (pubKey, privKey interface{}) {
+			setupKeys: func(t *testing.T) (pubKey, privKey any) {
 				priv, err := GenerateSecp256k1()
 				require.NoError(t, err)
 				return priv.PubKey(), priv
@@ -154,7 +164,7 @@ func TestVerify_TamperedMessage(t *testing.T) {
 		{
 			name:    "Ed25519 tampered message",
 			sigType: SignatureTypeEd25519,
-			setupKeys: func(t *testing.T) (pubKey, privKey interface{}) {
+			setupKeys: func(t *testing.T) (pubKey, privKey any) {
 				pub, priv, err := ed25519.GenerateKey(nil)
 				require.NoError(t, err)
 				return pub, priv
@@ -181,12 +191,12 @@ func TestVerify_TamperedSignature(t *testing.T) {
 	tests := []struct {
 		name      string
 		sigType   SignatureType
-		setupKeys func(t *testing.T) (pubKey, privKey interface{})
+		setupKeys func(t *testing.T) (pubKey, privKey any)
 	}{
 		{
 			name:    "ECDSA tampered signature",
 			sigType: SignatureTypeECDSA256K,
-			setupKeys: func(t *testing.T) (pubKey, privKey interface{}) {
+			setupKeys: func(t *testing.T) (pubKey, privKey any) {
 				priv, err := GenerateSecp256k1()
 				require.NoError(t, err)
 				return priv.PubKey(), priv
@@ -195,7 +205,7 @@ func TestVerify_TamperedSignature(t *testing.T) {
 		{
 			name:    "Ed25519 tampered signature",
 			sigType: SignatureTypeEd25519,
-			setupKeys: func(t *testing.T) (pubKey, privKey interface{}) {
+			setupKeys: func(t *testing.T) (pubKey, privKey any) {
 				pub, priv, err := ed25519.GenerateKey(nil)
 				require.NoError(t, err)
 				return pub, priv
@@ -241,13 +251,13 @@ func TestVerify_WrongPublicKey(t *testing.T) {
 	tests := []struct {
 		name      string
 		sigType   SignatureType
-		setupKeys func(t *testing.T) (correctPub, correctPriv, wrongPub interface{})
+		setupKeys func(t *testing.T) (correctPub, correctPriv, wrongPub any)
 		expectErr error
 	}{
 		{
 			name:    "ECDSA wrong public key",
 			sigType: SignatureTypeECDSA256K,
-			setupKeys: func(t *testing.T) (correctPub, correctPriv, wrongPub interface{}) {
+			setupKeys: func(t *testing.T) (correctPub, correctPriv, wrongPub any) {
 				priv1, err := GenerateSecp256k1()
 				require.NoError(t, err)
 				priv2, err := GenerateSecp256k1()
@@ -259,7 +269,7 @@ func TestVerify_WrongPublicKey(t *testing.T) {
 		{
 			name:    "Ed25519 wrong public key",
 			sigType: SignatureTypeEd25519,
-			setupKeys: func(t *testing.T) (correctPub, correctPriv, wrongPub interface{}) {
+			setupKeys: func(t *testing.T) (correctPub, correctPriv, wrongPub any) {
 				pub1, priv1, err := ed25519.GenerateKey(nil)
 				require.NoError(t, err)
 				pub2, _, err := ed25519.GenerateKey(nil)
@@ -288,7 +298,7 @@ func TestVerify_InvalidInputs(t *testing.T) {
 	tests := []struct {
 		name      string
 		sigType   SignatureType
-		pubKey    interface{}
+		pubKey    any
 		message   []byte
 		signature []byte
 		expectErr error

diff --git a/internal/core/block/block.go b/internal/core/block/block.go
@@ -15,13 +15,13 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ipfs/go-cid"
-	"github.com/ipld/go-ipld-prime"
+	cid "github.com/ipfs/go-cid"
+	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/ipld/go-ipld-prime/node/bindnode"
 	"github.com/ipld/go-ipld-prime/schema"
-	"github.com/multiformats/go-multicodec"
+	multicodec "github.com/multiformats/go-multicodec"
 
 	"github.com/sourcenetwork/defradb/internal/core"
 	"github.com/sourcenetwork/defradb/internal/core/crdt"
@@ -214,7 +214,7 @@ func New(delta core.Delta, links []DAGLink, heads ...cid.Cid) *Block {
 	// Sort the links lexicographically by CID.
 	// We need to do this to ensure that the block is deterministic.
 	sort.Slice(links, func(i, j int) bool {
-		return strings.Compare(links[i].Cid.String(), links[j].Cid.String()) < 0
+		return strings.Compare(links[i].Link.Cid.String(), links[j].Link.Cid.String()) < 0
 	})
 
 	blockLinks := make([]DAGLink, 0, len(links))

diff --git a/internal/core/block/block_test.go b/internal/core/block/block_test.go
@@ -13,7 +13,7 @@ package coreblock
 import (
 	"testing"
 
-	"github.com/ipld/go-ipld-prime"
+	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/linking"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/ipld/go-ipld-prime/node/basicnode"

diff --git a/internal/core/block/encryption.go b/internal/core/block/encryption.go
@@ -11,7 +11,7 @@
 package coreblock
 
 import (
-	"github.com/ipld/go-ipld-prime"
+	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/node/bindnode"
 )
 

diff --git a/internal/core/block/signature.go b/internal/core/block/signature.go
@@ -11,9 +11,10 @@
 package coreblock
 
 import (
-	"github.com/ipld/go-ipld-prime"
+	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/linking"
 	"github.com/ipld/go-ipld-prime/node/bindnode"
+
 	"github.com/sourcenetwork/defradb/crypto"
 )
 

diff --git a/internal/core/block/signature_test.go b/internal/core/block/signature_test.go
@@ -1,17 +1,28 @@
+// Copyright 2025 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
 package coreblock
 
 import (
 	"crypto/ed25519"
 	"testing"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
-	"github.com/ipld/go-ipld-prime"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
+	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/linking"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/ipld/go-ipld-prime/storage/memstore"
+	"github.com/stretchr/testify/require"
+
 	"github.com/sourcenetwork/defradb/crypto"
 	"github.com/sourcenetwork/defradb/internal/core/crdt"
-	"github.com/stretchr/testify/require"
 )
 
 type signatureTestKeys struct {
@@ -62,7 +73,8 @@ func createSignedBlock(t *testing.T, lsys *linking.LinkSystem, block *Block, sig
 
 	sigBlockLink, err := lsys.Store(ipld.LinkContext{}, GetLinkPrototype(), sigBlock.GenerateNode())
 	require.NoError(t, err)
-	sigLink := sigBlockLink.(cidlink.Link)
+	sigLink, ok := sigBlockLink.(cidlink.Link)
+	require.True(t, ok)
 	block.Signature = &sigLink
 }
 
@@ -117,7 +129,8 @@ func TestBlockMarshal_IfSignatureNotSet_ShouldNotContainSignatureField(t *testin
 	sigBlockLink, err := lsys.Store(ipld.LinkContext{}, GetLinkPrototype(), sigBlock.GenerateNode())
 	require.NoError(t, err)
 
-	link := sigBlockLink.(cidlink.Link)
+	link, ok := sigBlockLink.(cidlink.Link)
+	require.True(t, ok)
 
 	block := Block{
 		Delta: crdt.CRDT{
@@ -165,7 +178,8 @@ func TestBlockWithSignatureAndEncryption(t *testing.T) {
 	}
 	encBlockLink, err := lsys.Store(ipld.LinkContext{}, GetLinkPrototype(), encBlock.GenerateNode())
 	require.NoError(t, err)
-	encLink := encBlockLink.(cidlink.Link)
+	encLink, ok := encBlockLink.(cidlink.Link)
+	require.True(t, ok)
 
 	// Create signature block
 	sigBlock := Signature{
@@ -177,7 +191,8 @@ func TestBlockWithSignatureAndEncryption(t *testing.T) {
 	}
 	sigBlockLink, err := lsys.Store(ipld.LinkContext{}, GetLinkPrototype(), sigBlock.GenerateNode())
 	require.NoError(t, err)
-	sigLink := sigBlockLink.(cidlink.Link)
+	sigLink, ok := sigBlockLink.(cidlink.Link)
+	require.True(t, ok)
 
 	// Create block with both encryption and signature
 	block := Block{
@@ -282,7 +297,8 @@ func TestVerifyBlockSignature_UnsupportedType(t *testing.T) {
 
 	sigBlockLink, err := lsys.Store(ipld.LinkContext{}, GetLinkPrototype(), sigBlock.GenerateNode())
 	require.NoError(t, err)
-	sigLink := sigBlockLink.(cidlink.Link)
+	sigLink, ok := sigBlockLink.(cidlink.Link)
+	require.True(t, ok)
 	block.Signature = &sigLink
 
 	err = VerifyBlockSignature(&block, lsys)

diff --git a/internal/merkle/clock/clock.go b/internal/merkle/clock/clock.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Democratized Data Foundation
+// Copyright 2025 Democratized Data Foundation
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt.

diff --git a/tests/integration/acp.go b/tests/integration/acp.go
@@ -24,7 +24,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	toml "github.com/pelletier/go-toml"
 	"github.com/sourcenetwork/immutable"
 	"github.com/stretchr/testify/require"

diff --git a/tests/integration/identity.go b/tests/integration/identity.go
@@ -15,7 +15,7 @@ import (
 	"math/rand"
 	"strconv"
 
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
+	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/sourcenetwork/immutable"
 	"github.com/stretchr/testify/require"
 

diff --git a/tests/integration/signature/branchable_test.go b/tests/integration/signature/branchable_test.go
@@ -14,6 +14,7 @@ import (
 	"testing"
 
 	"github.com/onsi/gomega"
+
 	coreblock "github.com/sourcenetwork/defradb/internal/core/block"
 	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )

diff --git a/tests/integration/signature/commit_test.go b/tests/integration/signature/commit_test.go
@@ -14,6 +14,7 @@ import (
 	"testing"
 
 	"github.com/onsi/gomega"
+
 	coreblock "github.com/sourcenetwork/defradb/internal/core/block"
 	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )

diff --git a/tests/integration/signature/query_test.go b/tests/integration/signature/query_test.go
@@ -13,8 +13,9 @@ package signature
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 	"github.com/sourcenetwork/immutable"
+
+	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )
 
 func TestDocSignature_WithEnabledSigning_ShouldQuery(t *testing.T) {

diff --git a/tests/integration/state.go b/tests/integration/state.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Democratized Data Foundation
+// Copyright 2025 Democratized Data Foundation
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt.
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/sourcenetwork/defradb/client"

diff --git a/tests/integration/test_case.go b/tests/integration/test_case.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Democratized Data Foundation
+// Copyright 2025 Democratized Data Foundation
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt.
@@ -70,8 +70,8 @@ type TestCase struct {
 
 	// Configuration for KMS to be used in the test
 	KMS KMS
-	
-	// If set to true DAG blocks will be signed with a separate block that 
+
+	// If set to true DAG blocks will be signed with a separate block that
 	EnabledBlockSigning bool
 }