Skip to content

Commit

Permalink
refactor: v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@acha-bill
acha-bill committed Mar 18, 2024
1 parent ef7c97d commit bc051ea
Show file tree
Hide file tree
Showing 575 changed files with 2,370 additions and 2,370 deletions.
8 changes: 4 additions & 4 deletions cmd/bee/cmd/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"strings"
"time"

chaincfg "github.com/ethersphere/bee/pkg/config"
"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/pkg/swarm"
chaincfg "github.com/ethersphere/bee/v2/pkg/config"
"github.com/ethersphere/bee/v2/pkg/log"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/cmd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"testing"

"github.com/ethersphere/bee/cmd/bee/cmd"
"github.com/ethersphere/bee/v2/cmd/bee/cmd"
)

var homeDir string
Expand Down
10 changes: 5 additions & 5 deletions cmd/bee/cmd/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"strings"
"time"

"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/pkg/postage"
"github.com/ethersphere/bee/pkg/storage"
"github.com/ethersphere/bee/pkg/storer"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/ethersphere/bee/v2/pkg/postage"
"github.com/ethersphere/bee/v2/pkg/storage"
"github.com/ethersphere/bee/v2/pkg/storer"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/bee/cmd/db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import (
"strings"
"testing"

"github.com/ethersphere/bee/cmd/bee/cmd"
"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/pkg/postage"
storagetest "github.com/ethersphere/bee/pkg/storage/testing"
"github.com/ethersphere/bee/pkg/storer"
"github.com/ethersphere/bee/pkg/swarm"
kademlia "github.com/ethersphere/bee/pkg/topology/mock"
"github.com/ethersphere/bee/pkg/util/testutil"
"github.com/ethersphere/bee/v2/cmd/bee/cmd"
"github.com/ethersphere/bee/v2/pkg/log"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/ethersphere/bee/v2/pkg/postage"
storagetest "github.com/ethersphere/bee/v2/pkg/storage/testing"
"github.com/ethersphere/bee/v2/pkg/storer"
"github.com/ethersphere/bee/v2/pkg/swarm"
kademlia "github.com/ethersphere/bee/v2/pkg/topology/mock"
"github.com/ethersphere/bee/v2/pkg/util/testutil"
)

func TestDBExportImport(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/bee/cmd/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"strings"

"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/pkg/settlement/swap/erc20"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/bee/cmd/split.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"strings"
"sync/atomic"

"github.com/ethersphere/bee/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/pkg/file/redundancy"
"github.com/ethersphere/bee/pkg/storage"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/storage"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions cmd/bee/cmd/split_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"sync"
"testing"

"github.com/ethersphere/bee/cmd/bee/cmd"
"github.com/ethersphere/bee/pkg/api"
"github.com/ethersphere/bee/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/pkg/file/redundancy"
"github.com/ethersphere/bee/pkg/storage"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/cmd/bee/cmd"
"github.com/ethersphere/bee/v2/pkg/api"
"github.com/ethersphere/bee/v2/pkg/file/pipeline/builder"
"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/storage"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

func TestDBSplitRefs(t *testing.T) {
Expand Down
24 changes: 12 additions & 12 deletions cmd/bee/cmd/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ import (
"github.com/ethereum/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethersphere/bee"
chaincfg "github.com/ethersphere/bee/pkg/config"
"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/crypto/clef"
"github.com/ethersphere/bee/pkg/keystore"
filekeystore "github.com/ethersphere/bee/pkg/keystore/file"
memkeystore "github.com/ethersphere/bee/pkg/keystore/mem"
"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/pkg/resolver/multiresolver"
"github.com/ethersphere/bee/pkg/spinlock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2"
chaincfg "github.com/ethersphere/bee/v2/pkg/config"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/crypto/clef"
"github.com/ethersphere/bee/v2/pkg/keystore"
filekeystore "github.com/ethersphere/bee/v2/pkg/keystore/file"
memkeystore "github.com/ethersphere/bee/v2/pkg/keystore/mem"
"github.com/ethersphere/bee/v2/pkg/log"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/ethersphere/bee/v2/pkg/resolver/multiresolver"
"github.com/ethersphere/bee/v2/pkg/spinlock"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/kardianos/service"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/start_dev.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"syscall"

"github.com/ethersphere/bee/pkg/node"
"github.com/ethersphere/bee/v2/pkg/node"
"github.com/kardianos/service"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/start_unix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package cmd
import (
"errors"

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

func isWindowsService() (bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/start_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"golang.org/x/sys/windows/svc/debug"
"golang.org/x/sys/windows/svc/eventlog"

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

func isWindowsService() (bool, error) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/bee/cmd/timebomb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"time"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package cmd

import (
"github.com/ethersphere/bee"
"github.com/ethersphere/bee/v2"

"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/bee/cmd/version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"bytes"
"testing"

"github.com/ethersphere/bee"
"github.com/ethersphere/bee/cmd/bee/cmd"
"github.com/ethersphere/bee/v2"
"github.com/ethersphere/bee/v2/cmd/bee/cmd"
)

func TestVersionCmd(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"os"

"github.com/ethersphere/bee/cmd/bee/cmd"
"github.com/ethersphere/bee/v2/cmd/bee/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ethersphere/bee
module github.com/ethersphere/bee/v2

go 1.21

Expand Down
12 changes: 6 additions & 6 deletions pkg/accounting/accounting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"sync"
"time"

"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/p2p"
"github.com/ethersphere/bee/pkg/pricing"
"github.com/ethersphere/bee/pkg/settlement/pseudosettle"
"github.com/ethersphere/bee/pkg/storage"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/log"
"github.com/ethersphere/bee/v2/pkg/p2p"
"github.com/ethersphere/bee/v2/pkg/pricing"
"github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle"
"github.com/ethersphere/bee/v2/pkg/storage"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

// loggerName is the tree path name of the logger for this package.
Expand Down
12 changes: 6 additions & 6 deletions pkg/accounting/accounting_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"testing"
"time"

"github.com/ethersphere/bee/pkg/accounting"
"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/p2p"
p2pmock "github.com/ethersphere/bee/pkg/p2p/mock"
"github.com/ethersphere/bee/pkg/statestore/mock"
"github.com/ethersphere/bee/v2/pkg/accounting"
"github.com/ethersphere/bee/v2/pkg/log"
"github.com/ethersphere/bee/v2/pkg/p2p"
p2pmock "github.com/ethersphere/bee/v2/pkg/p2p/mock"
"github.com/ethersphere/bee/v2/pkg/statestore/mock"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/accounting/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package accounting
import (
"time"

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

func (a *Accounting) SetTimeNow(f func() time.Time) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/accounting/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package accounting

import (
m "github.com/ethersphere/bee/pkg/metrics"
m "github.com/ethersphere/bee/v2/pkg/metrics"
"github.com/prometheus/client_golang/prometheus"
)

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

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

// Service is the mock Accounting service.
Expand Down
6 changes: 3 additions & 3 deletions pkg/addressbook/addressbook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"fmt"
"strings"

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

const keyPrefix = "addressbook_entry_"
Expand Down
10 changes: 5 additions & 5 deletions pkg/addressbook/addressbook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethersphere/bee/pkg/addressbook"
"github.com/ethersphere/bee/pkg/bzz"
"github.com/ethersphere/bee/pkg/crypto"
"github.com/ethersphere/bee/pkg/statestore/mock"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/v2/pkg/addressbook"
"github.com/ethersphere/bee/v2/pkg/bzz"
"github.com/ethersphere/bee/v2/pkg/crypto"
"github.com/ethersphere/bee/v2/pkg/statestore/mock"
"github.com/ethersphere/bee/v2/pkg/swarm"

ma "github.com/multiformats/go-multiaddr"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/accounting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package api
import (
"net/http"

"github.com/ethersphere/bee/pkg/bigint"
"github.com/ethersphere/bee/pkg/jsonhttp"
"github.com/ethersphere/bee/v2/pkg/bigint"
"github.com/ethersphere/bee/v2/pkg/jsonhttp"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions pkg/api/accounting_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"reflect"
"testing"

"github.com/ethersphere/bee/pkg/accounting"
"github.com/ethersphere/bee/pkg/accounting/mock"
"github.com/ethersphere/bee/pkg/api"
"github.com/ethersphere/bee/pkg/bigint"
"github.com/ethersphere/bee/pkg/jsonhttp"
"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
"github.com/ethersphere/bee/v2/pkg/accounting"
"github.com/ethersphere/bee/v2/pkg/accounting/mock"
"github.com/ethersphere/bee/v2/pkg/api"
"github.com/ethersphere/bee/v2/pkg/bigint"
"github.com/ethersphere/bee/v2/pkg/jsonhttp"
"github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest"
)

func TestAccountingInfo(t *testing.T) {
Expand Down
Loading

0 comments on commit bc051ea

Please sign in to comment.