Skip to content

Commit

Permalink
chore: use berty.tech.weshnet/v2 as module path (#101)
Browse files Browse the repository at this point in the history
Signed-off-by: D4ryl00 <d4ryl00@gmail.com>
  • Loading branch information
D4ryl00 authored Oct 7, 2024
1 parent aaa7aae commit ff80fe3
Show file tree
Hide file tree
Showing 126 changed files with 290 additions and 290 deletions.
4 changes: 2 additions & 2 deletions account_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"google.golang.org/protobuf/proto"

orbitdb "berty.tech/go-orbit-db"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions account_export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (

orbitdb "berty.tech/go-orbit-db"
"berty.tech/go-orbit-db/pubsub/pubsubraw"
"berty.tech/weshnet/pkg/ipfsutil"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/secretstore"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/pkg/tinder"
"berty.tech/weshnet/v2/pkg/ipfsutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/secretstore"
"berty.tech/weshnet/v2/pkg/testutil"
"berty.tech/weshnet/v2/pkg/tinder"
)

func Test_service_exportAccountKeys(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions api_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

func (s *service) AppMetadataSend(ctx context.Context, req *protocoltypes.AppMetadataSend_Request) (_ *protocoltypes.AppMetadataSend_Reply, err error) {
Expand Down
6 changes: 3 additions & 3 deletions api_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"io"
"sync"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

func (s *service) ServiceExportData(_ *protocoltypes.ServiceExportData_Request, server protocoltypes.ProtocolService_ServiceExportDataServer) (err error) {
Expand Down
6 changes: 3 additions & 3 deletions api_contact.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/libp2p/go-libp2p/core/crypto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

func (s *service) ContactAliasKeySend(ctx context.Context, req *protocoltypes.ContactAliasKeySend_Request) (_ *protocoltypes.ContactAliasKeySend_Reply, err error) {
Expand Down
4 changes: 2 additions & 2 deletions api_contact_request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
"github.com/stretchr/testify/require"

"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/testutil"
)

func TestShareContact(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions api_contactrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

// ContactRequestReference retrieves the necessary information to create a contact link
Expand Down
6 changes: 3 additions & 3 deletions api_debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"google.golang.org/protobuf/proto"

"berty.tech/go-orbit-db/stores/operation"
"berty.tech/weshnet/internal/sysutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/internal/sysutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

func (s *service) DebugListGroups(_ *protocoltypes.DebugListGroups_Request, srv protocoltypes.ProtocolService_DebugListGroupsServer) error {
Expand Down
4 changes: 2 additions & 2 deletions api_event.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/libp2p/go-libp2p/p2p/host/eventbus"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

func checkParametersConsistency(sinceID, untilID []byte, sinceNow, untilNow, reverseOrder bool) error {
Expand Down
6 changes: 3 additions & 3 deletions api_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/logutil"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/logutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

func (s *service) GroupInfo(ctx context.Context, req *protocoltypes.GroupInfo_Request) (*protocoltypes.GroupInfo_Reply, error) {
Expand Down
6 changes: 3 additions & 3 deletions api_multimember.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/libp2p/go-libp2p/core/crypto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

// MultiMemberGroupCreate creates a new MultiMember group
Expand Down
12 changes: 6 additions & 6 deletions api_replication.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/grpcutil"
"berty.tech/weshnet/pkg/logutil"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/replicationtypes"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/grpcutil"
"berty.tech/weshnet/v2/pkg/logutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/replicationtypes"
"berty.tech/weshnet/v2/pkg/tyber"
)

func FilterGroupForReplication(m *protocoltypes.Group) (*protocoltypes.Group, error) {
Expand Down
8 changes: 4 additions & 4 deletions api_verified_credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strings"
"time"

"berty.tech/weshnet/pkg/bertyvcissuer"
"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/bertyvcissuer"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

func (s *service) CredentialVerificationServiceInitFlow(ctx context.Context, request *protocoltypes.CredentialVerificationServiceInitFlow_Request) (*protocoltypes.CredentialVerificationServiceInitFlow_Reply, error) {
Expand Down
8 changes: 4 additions & 4 deletions blackbox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"berty.tech/weshnet"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/secretstore"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/v2"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/secretstore"
"berty.tech/weshnet/v2/pkg/testutil"
)

func TestTestingClient_impl(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion connectedness_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

peer "github.com/libp2p/go-libp2p/core/peer"

"berty.tech/weshnet/internal/notify"
"berty.tech/weshnet/v2/internal/notify"
)

type ConnectednessType int
Expand Down
14 changes: 7 additions & 7 deletions contact_request_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/internal/handshake"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/ipfsutil"
"berty.tech/weshnet/pkg/logutil"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/internal/handshake"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/ipfsutil"
"berty.tech/weshnet/v2/pkg/logutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/tyber"
)

const contactRequestV1 = "/wesh/contact_req/1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions contact_request_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/testutil"
)

func TestContactRequestFlow(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions deactivate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
"github.com/stretchr/testify/require"

"berty.tech/weshnet"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/pkg/tinder"
"berty.tech/weshnet/v2"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/testutil"
"berty.tech/weshnet/v2/pkg/tinder"
)

func TestReactivateAccountGroup(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions events.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"google.golang.org/protobuf/proto"

ipfslog "berty.tech/go-ipfs-log"
"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

var eventTypesMapper = map[protocoltypes.EventType]struct {
Expand Down
4 changes: 2 additions & 2 deletions events_sig_checkers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

type sigChecker func(g *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, message proto.Message) error
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module berty.tech/weshnet
module berty.tech/weshnet/v2

go 1.22

Expand Down
4 changes: 2 additions & 2 deletions group.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protocoltypes"
)

const CurrentGroupVersion = 1
Expand Down
10 changes: 5 additions & 5 deletions group_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"google.golang.org/protobuf/proto"

"berty.tech/go-orbit-db/stores"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/ipfsutil"
"berty.tech/weshnet/pkg/logutil"
"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/secretstore"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/ipfsutil"
"berty.tech/weshnet/v2/pkg/logutil"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/secretstore"
)

type GroupContext struct {
Expand Down
4 changes: 2 additions & 2 deletions iface_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package weshnet
import (
"github.com/libp2p/go-libp2p/core/crypto"

"berty.tech/weshnet/pkg/protocoltypes"
"berty.tech/weshnet/pkg/secretstore"
"berty.tech/weshnet/v2/pkg/protocoltypes"
"berty.tech/weshnet/v2/pkg/secretstore"
)

type AccountKeys interface {
Expand Down
8 changes: 4 additions & 4 deletions internal/handshake/handshake.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
"golang.org/x/crypto/nacl/box"

"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/tyber"
)

// Constant nonces
Expand Down
10 changes: 5 additions & 5 deletions internal/handshake/handshake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"golang.org/x/crypto/nacl/box"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/ipfsutil"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/testutil"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/ipfsutil"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/testutil"
)

// Request init a handshake with the responder
Expand Down
6 changes: 3 additions & 3 deletions internal/handshake/handshake_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
"github.com/stretchr/testify/require"

"berty.tech/weshnet/pkg/ipfsutil"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/tinder"
"berty.tech/weshnet/v2/pkg/ipfsutil"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/tinder"
)

const testProtocolID = "/berty/handshake_test/1.0.0"
Expand Down
8 changes: 4 additions & 4 deletions internal/handshake/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"golang.org/x/crypto/nacl/box"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/tyber"
)

// RequestUsingReaderWriter init a handshake with the responder, using provided io reader and writer
Expand Down
8 changes: 4 additions & 4 deletions internal/handshake/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"golang.org/x/crypto/nacl/box"
"google.golang.org/protobuf/proto"

"berty.tech/weshnet/pkg/cryptoutil"
"berty.tech/weshnet/pkg/errcode"
"berty.tech/weshnet/pkg/protoio"
"berty.tech/weshnet/pkg/tyber"
"berty.tech/weshnet/v2/pkg/cryptoutil"
"berty.tech/weshnet/v2/pkg/errcode"
"berty.tech/weshnet/v2/pkg/protoio"
"berty.tech/weshnet/v2/pkg/tyber"
)

// ResponseUsingReaderWriter handle the handshake inited by the requester, using provided io reader and writer
Expand Down
Loading

0 comments on commit ff80fe3

Please sign in to comment.