Skip to content

Commit

Permalink
Update package imports to use the v2 version of the modules (#33)
Browse files Browse the repository at this point in the history 
Co-authored-by: Ferenc Sárai <[email protected]>
  • Loading branch information
@ferencsarai @aranyia
2 people authored and aranyia committed Apr 9, 2024
1 parent 9a95e91 commit 082c228
Show file tree
Hide file tree
Showing 18 changed files with 65 additions and 65 deletions.
6 changes: 3 additions & 3 deletions pkg/dynamicaccess/accesslogic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package dynamicaccess
import (
"crypto/ecdsa"

encryption "github.com/ethersphere/bee/pkg/encryption"
"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/pkg/swarm"
encryption "github.com/ethersphere/bee/v2/pkg/encryption"
"github.com/ethersphere/bee/v2/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/swarm"
"golang.org/x/crypto/sha3"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/dynamicaccess/accesslogic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"encoding/hex"
"testing"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/dynamicaccess"
kvsmock "github.com/ethersphere/bee/pkg/kvs/mock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

// Generates a new test environment with a fix private key
Expand Down
4 changes: 2 additions & 2 deletions pkg/dynamicaccess/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dynamicaccess
import (
"crypto/ecdsa"

kvsmock "github.com/ethersphere/bee/pkg/kvs/mock"
"github.com/ethersphere/bee/pkg/swarm"
kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type Controller interface {
Expand Down
12 changes: 6 additions & 6 deletions pkg/dynamicaccess/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"testing"
"time"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/dynamicaccess"
"github.com/ethersphere/bee/pkg/dynamicaccess/mock"
"github.com/ethersphere/bee/pkg/encryption"
kvsmock "github.com/ethersphere/bee/pkg/kvs/mock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess/mock"
"github.com/ethersphere/bee/v2/pkg/encryption"
kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"
"golang.org/x/crypto/sha3"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/dynamicaccess/grantee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"crypto/elliptic"
"fmt"

"github.com/ethersphere/bee/pkg/file"
"github.com/ethersphere/bee/pkg/storer"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/file"
"github.com/ethersphere/bee/v2/pkg/storer"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/dynamicaccess/grantee_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package dynamicaccess
import (
"crypto/ecdsa"

"github.com/ethersphere/bee/pkg/dynamicaccess/mock"
"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess/mock"
"github.com/ethersphere/bee/v2/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type GranteeManager interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/dynamicaccess/grantee_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"testing"

"github.com/ethersphere/bee/pkg/dynamicaccess"
kvsmock "github.com/ethersphere/bee/pkg/kvs/mock"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
)

func setupAccessLogic(privateKey *ecdsa.PrivateKey) dynamicaccess.ActLogic {
Expand Down
18 changes: 9 additions & 9 deletions pkg/dynamicaccess/grantee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (
"crypto/rand"
"testing"

"github.com/ethersphere/bee/pkg/dynamicaccess"
"github.com/ethersphere/bee/pkg/file"
"github.com/ethersphere/bee/pkg/file/loadsave"
"github.com/ethersphere/bee/pkg/file/pipeline"
"github.com/ethersphere/bee/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/pkg/file/redundancy"
"github.com/ethersphere/bee/pkg/storage"
mockstorer "github.com/ethersphere/bee/pkg/storer/mock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
"github.com/ethersphere/bee/v2/pkg/file"
"github.com/ethersphere/bee/v2/pkg/file/loadsave"
"github.com/ethersphere/bee/v2/pkg/file/pipeline"
"github.com/ethersphere/bee/v2/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/storage"
mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/dynamicaccess/history.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package dynamicaccess

import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/kvs"
)

type History interface {
Expand Down
6 changes: 3 additions & 3 deletions pkg/dynamicaccess/history_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"
"time"

"github.com/ethersphere/bee/pkg/dynamicaccess"
"github.com/ethersphere/bee/pkg/dynamicaccess/mock"
kvsmock "github.com/ethersphere/bee/pkg/kvs/mock"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess/mock"
kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/dynamicaccess/mock/grantee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mock
import (
"crypto/ecdsa"

"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type GranteeListMock interface {
Expand Down
10 changes: 5 additions & 5 deletions pkg/dynamicaccess/mock/history.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"sort"
"time"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/feeds"
"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/pkg/storage"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/feeds"
"github.com/ethersphere/bee/v2/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/storage"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type historyMock struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/dynamicaccess/mock/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package mock
import (
"crypto/ecdsa"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/keystore"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/keystore"
)

type SessionMock struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/dynamicaccess/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"crypto/ecdsa"
"errors"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/keystore"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/keystore"
)

// Session represents an interface for a Diffie-Helmann key derivation
Expand Down
8 changes: 4 additions & 4 deletions pkg/dynamicaccess/session_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"io"
"testing"

"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/dynamicaccess"
"github.com/ethersphere/bee/pkg/dynamicaccess/mock"
memkeystore "github.com/ethersphere/bee/pkg/keystore/mem"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
"github.com/ethersphere/bee/v2/pkg/dynamicaccess/mock"
memkeystore "github.com/ethersphere/bee/v2/pkg/keystore/mem"
)

func mockKeyFunc(publicKey *ecdsa.PublicKey, nonces [][]byte) ([][]byte, error) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/kvs/kvs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"encoding/hex"
"errors"

"github.com/ethersphere/bee/pkg/file"
"github.com/ethersphere/bee/pkg/manifest"
"github.com/ethersphere/bee/pkg/storer"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/file"
"github.com/ethersphere/bee/v2/pkg/manifest"
"github.com/ethersphere/bee/v2/pkg/storer"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type KeyValueStore interface {
Expand Down
18 changes: 9 additions & 9 deletions pkg/kvs/kvs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import (
"context"
"testing"

"github.com/ethersphere/bee/pkg/file"
"github.com/ethersphere/bee/pkg/file/loadsave"
"github.com/ethersphere/bee/pkg/file/pipeline"
"github.com/ethersphere/bee/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/pkg/file/redundancy"
"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/pkg/storage"
mockstorer "github.com/ethersphere/bee/pkg/storer/mock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/file"
"github.com/ethersphere/bee/v2/pkg/file/loadsave"
"github.com/ethersphere/bee/v2/pkg/file/pipeline"
"github.com/ethersphere/bee/v2/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/storage"
mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kvs/mock/kvs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/hex"
"sync"

"github.com/ethersphere/bee/pkg/kvs"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/kvs"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

var lock = &sync.Mutex{}
Expand Down

0 comments on commit 082c228

Please sign in to comment.