From ff80fe313bcb897a0c713069c4b898775cd62a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20BARBERO?= Date: Mon, 7 Oct 2024 14:29:19 +0200 Subject: [PATCH] chore: use berty.tech.weshnet/v2 as module path (#101) Signed-off-by: D4ryl00 --- account_export.go | 4 ++-- account_export_test.go | 10 +++++----- api_app.go | 6 +++--- api_client.go | 6 +++--- api_contact.go | 6 +++--- api_contact_request_test.go | 4 ++-- api_contactrequest.go | 6 +++--- api_debug.go | 6 +++--- api_event.go | 4 ++-- api_group.go | 6 +++--- api_multimember.go | 6 +++--- api_replication.go | 12 +++++------ api_verified_credentials.go | 8 ++++---- blackbox_test.go | 8 ++++---- connectedness_manager.go | 2 +- contact_request_manager.go | 14 ++++++------- contact_request_manager_test.go | 4 ++-- deactivate_test.go | 8 ++++---- events.go | 6 +++--- events_sig_checkers.go | 4 ++-- go.mod | 2 +- group.go | 4 ++-- group_context.go | 10 +++++----- iface_account.go | 4 ++-- internal/handshake/handshake.go | 8 ++++---- internal/handshake/handshake_test.go | 10 +++++----- internal/handshake/handshake_util_test.go | 6 +++--- internal/handshake/request.go | 8 ++++---- internal/handshake/response.go | 8 ++++---- internal/sysutil/sysutil.go | 6 +++--- internal/sysutil/sysutil_unix.go | 2 +- internal/sysutil/sysutil_unsupported.go | 2 +- message_marshaler.go | 6 +++--- message_marshaler_test.go | 4 ++-- orbitdb.go | 12 +++++------ orbitdb_datastore_cache.go | 2 +- orbitdb_many_adds_berty_test.go | 8 ++++---- orbitdb_many_adds_test.go | 6 +++--- orbitdb_signed_entry_accesscontroller.go | 2 +- orbitdb_signed_entry_identity_provider.go | 2 +- orbitdb_signed_entry_keystore.go | 2 +- orbitdb_test.go | 10 +++++----- orbitdb_utils_test.go | 2 +- outofstoremessage_test.go | 6 +++--- pkg/androidnearby/bridge_android.go | 2 +- pkg/androidnearby/bridge_unsupported.go | 2 +- pkg/bertyvcissuer/client.go | 4 ++-- .../verifiable_public_key_fetcher.go | 2 +- pkg/ble-driver/bridge_android.go | 2 +- pkg/ble-driver/bridge_darwin.go | 2 +- pkg/ble-driver/bridge_unsupported.go | 2 +- pkg/cryptoutil/cryptoutil.go | 2 +- pkg/cryptoutil/cryptoutil_test.go | 2 +- pkg/ipfsutil/conn_logger.go | 2 +- pkg/ipfsutil/helpers.go | 2 +- pkg/ipfsutil/keystore_datastore.go | 2 +- pkg/ipfsutil/lifecycle.go | 6 +++--- pkg/ipfsutil/localrecord.go | 2 +- pkg/ipfsutil/mobile.go | 2 +- pkg/ipfsutil/peering.go | 2 +- pkg/ipfsutil/pubsub_api.go | 2 +- pkg/ipfsutil/pubsub_monitor.go | 2 +- pkg/ipfsutil/repo.go | 2 +- pkg/ipfsutil/testing.go | 4 ++-- pkg/lifecycle/manager.go | 2 +- pkg/logutil/example_test.go | 2 +- pkg/logutil/file.go | 2 +- pkg/logutil/logutil.go | 2 +- pkg/logutil/logutil_test.go | 2 +- .../bridge_darwin.go | 4 ++-- .../bridge_unsupported.go | 2 +- .../driver/cgo_bridge.go | 2 +- pkg/netmanager/netmanager.go | 2 +- .../outofstoremessage.pb.go | 2 +- .../outofstoremessage.pb.gw.go | 2 +- .../outofstoremessage_grpc.pb.go | 2 +- pkg/protocoltypes/contact.go | 2 +- pkg/protocoltypes/group.go | 4 ++-- pkg/proximitytransport/conn.go | 2 +- pkg/proximitytransport/mplex.go | 2 +- pkg/proximitytransport/ringBuffer_map.go | 2 +- pkg/proximitytransport/transport.go | 2 +- pkg/rendezvous/emitterio_sync_test.go | 2 +- pkg/rendezvous/rendezvous_test.go | 2 +- pkg/replicationtypes/bertyreplication.pb.go | 2 +- pkg/replicationtypes/models.go | 2 +- pkg/secretstore/chain_key.go | 6 +++--- pkg/secretstore/datastore_keys.go | 2 +- pkg/secretstore/device_keystore_wrapper.go | 6 +++--- .../device_keystore_wrapper_test.go | 4 ++-- pkg/secretstore/keys_utils.go | 6 +++--- pkg/secretstore/secret_store.go | 10 +++++----- pkg/secretstore/secret_store_interfaces.go | 2 +- pkg/secretstore/secret_store_messages.go | 8 ++++---- pkg/secretstore/secret_store_messages_test.go | 8 ++++---- pkg/secretstore/secret_store_test.go | 2 +- pkg/testutil/filters.go | 2 +- pkg/testutil/logging.go | 2 +- pkg/testutil/skip_test.go | 2 +- pkg/tinder/driver_localdiscovery.go | 10 +++++----- pkg/tinder/driver_localdiscovery_test.go | 2 +- pkg/tinder/driver_service_test.go | 2 +- pkg/tinder/notify_network.go | 4 ++-- pkg/tinder/peer_cache.go | 2 +- pkg/tinder/service.go | 2 +- pkg/tinder/service_adaptater.go | 2 +- pkg/tinder/service_advertises.go | 2 +- pkg/tinder/service_mocked_test.go | 2 +- scenario_test.go | 8 ++++---- service.go | 20 +++++++++---------- service_client.go | 10 +++++----- service_group.go | 6 +++--- service_outofstoremessage.go | 10 +++++----- store_message.go | 10 +++++----- store_message_metrics.go | 2 +- store_message_queue.go | 4 ++-- store_message_test.go | 4 ++-- store_metadata.go | 8 ++++---- store_metadata_index.go | 8 ++++---- store_metadata_test.go | 6 +++--- store_options.go | 4 ++-- store_utils.go | 2 +- testing.go | 14 ++++++------- testing_test.go | 2 +- tinder_swiper.go | 8 ++++---- tinder_swiper_test.go | 8 ++++---- 126 files changed, 290 insertions(+), 290 deletions(-) diff --git a/account_export.go b/account_export.go index 63971229..96aa4884 100644 --- a/account_export.go +++ b/account_export.go @@ -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 ( diff --git a/account_export_test.go b/account_export_test.go index 23ceb236..8779d5fe 100644 --- a/account_export_test.go +++ b/account_export_test.go @@ -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) { diff --git a/api_app.go b/api_app.go index 81e57701..9ed2cd8c 100644 --- a/api_app.go +++ b/api_app.go @@ -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) { diff --git a/api_client.go b/api_client.go index f629f342..472865eb 100644 --- a/api_client.go +++ b/api_client.go @@ -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) { diff --git a/api_contact.go b/api_contact.go index fd1b3c15..488a8e7c 100644 --- a/api_contact.go +++ b/api_contact.go @@ -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) { diff --git a/api_contact_request_test.go b/api_contact_request_test.go index 9d8481fd..40526f07 100644 --- a/api_contact_request_test.go +++ b/api_contact_request_test.go @@ -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) { diff --git a/api_contactrequest.go b/api_contactrequest.go index 95d38d91..9ebbf2d0 100644 --- a/api_contactrequest.go +++ b/api_contactrequest.go @@ -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 diff --git a/api_debug.go b/api_debug.go index 4d2aa642..6eb9c060 100644 --- a/api_debug.go +++ b/api_debug.go @@ -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 { diff --git a/api_event.go b/api_event.go index cf61540b..cc21bba0 100644 --- a/api_event.go +++ b/api_event.go @@ -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 { diff --git a/api_group.go b/api_group.go index 5824bc62..7e48247a 100644 --- a/api_group.go +++ b/api_group.go @@ -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) { diff --git a/api_multimember.go b/api_multimember.go index 03003b40..eb4e375a 100644 --- a/api_multimember.go +++ b/api_multimember.go @@ -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 diff --git a/api_replication.go b/api_replication.go index 441dda3b..b71ffd8f 100644 --- a/api_replication.go +++ b/api_replication.go @@ -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) { diff --git a/api_verified_credentials.go b/api_verified_credentials.go index 98bec421..2778acc6 100644 --- a/api_verified_credentials.go +++ b/api_verified_credentials.go @@ -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) { diff --git a/blackbox_test.go b/blackbox_test.go index 7a7242bf..ba73f361 100644 --- a/blackbox_test.go +++ b/blackbox_test.go @@ -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) { diff --git a/connectedness_manager.go b/connectedness_manager.go index 4243210d..01977248 100644 --- a/connectedness_manager.go +++ b/connectedness_manager.go @@ -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 diff --git a/contact_request_manager.go b/contact_request_manager.go index 60cf79cc..6bf70dd5 100644 --- a/contact_request_manager.go +++ b/contact_request_manager.go @@ -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" diff --git a/contact_request_manager_test.go b/contact_request_manager_test.go index ef8ae988..3880a420 100644 --- a/contact_request_manager_test.go +++ b/contact_request_manager_test.go @@ -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) { diff --git a/deactivate_test.go b/deactivate_test.go index 8928fcb2..5d099e38 100644 --- a/deactivate_test.go +++ b/deactivate_test.go @@ -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) { diff --git a/events.go b/events.go index 1a086168..831d1c3d 100644 --- a/events.go +++ b/events.go @@ -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 { diff --git a/events_sig_checkers.go b/events_sig_checkers.go index eca58ce3..d77eb622 100644 --- a/events_sig_checkers.go +++ b/events_sig_checkers.go @@ -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 diff --git a/go.mod b/go.mod index f1cf12f1..8635a3fc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module berty.tech/weshnet +module berty.tech/weshnet/v2 go 1.22 diff --git a/group.go b/group.go index 57e6945f..637e6ff4 100644 --- a/group.go +++ b/group.go @@ -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 diff --git a/group_context.go b/group_context.go index a6535fa9..9872d6f3 100644 --- a/group_context.go +++ b/group_context.go @@ -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 { diff --git a/iface_account.go b/iface_account.go index 945eec8f..221cc628 100644 --- a/iface_account.go +++ b/iface_account.go @@ -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 { diff --git a/internal/handshake/handshake.go b/internal/handshake/handshake.go index 99e2ee62..04083827 100644 --- a/internal/handshake/handshake.go +++ b/internal/handshake/handshake.go @@ -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 diff --git a/internal/handshake/handshake_test.go b/internal/handshake/handshake_test.go index b62b7b9f..17937eca 100644 --- a/internal/handshake/handshake_test.go +++ b/internal/handshake/handshake_test.go @@ -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 diff --git a/internal/handshake/handshake_util_test.go b/internal/handshake/handshake_util_test.go index b94adb36..8f719b40 100644 --- a/internal/handshake/handshake_util_test.go +++ b/internal/handshake/handshake_util_test.go @@ -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" diff --git a/internal/handshake/request.go b/internal/handshake/request.go index f5a9eeff..ee8717dc 100644 --- a/internal/handshake/request.go +++ b/internal/handshake/request.go @@ -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 diff --git a/internal/handshake/response.go b/internal/handshake/response.go index 18fa7e3f..4b82b56d 100644 --- a/internal/handshake/response.go +++ b/internal/handshake/response.go @@ -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 diff --git a/internal/sysutil/sysutil.go b/internal/sysutil/sysutil.go index 64eefee3..d406e392 100644 --- a/internal/sysutil/sysutil.go +++ b/internal/sysutil/sysutil.go @@ -8,9 +8,9 @@ import ( "go.uber.org/multierr" "moul.io/openfiles" - "berty.tech/weshnet/internal/bertyversion" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/username" + "berty.tech/weshnet/v2/internal/bertyversion" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/username" ) func SystemInfoProcess() (*protocoltypes.SystemInfo_Process, error) { diff --git a/internal/sysutil/sysutil_unix.go b/internal/sysutil/sysutil_unix.go index 18ad0afc..1de48239 100644 --- a/internal/sysutil/sysutil_unix.go +++ b/internal/sysutil/sysutil_unix.go @@ -8,7 +8,7 @@ import ( "go.uber.org/multierr" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func appendCustomSystemInfo(reply *protocoltypes.SystemInfo_Process) error { diff --git a/internal/sysutil/sysutil_unsupported.go b/internal/sysutil/sysutil_unsupported.go index b761bdd1..7c3abd5b 100644 --- a/internal/sysutil/sysutil_unsupported.go +++ b/internal/sysutil/sysutil_unsupported.go @@ -3,7 +3,7 @@ package sysutil -import "berty.tech/weshnet/pkg/protocoltypes" +import "berty.tech/weshnet/v2/pkg/protocoltypes" func appendCustomSystemInfo(reply *protocoltypes.SystemInfo_Process) error { return nil diff --git a/message_marshaler.go b/message_marshaler.go index 8edd7761..e5ce02f8 100644 --- a/message_marshaler.go +++ b/message_marshaler.go @@ -12,9 +12,9 @@ import ( "berty.tech/go-ipfs-log/enc" "berty.tech/go-ipfs-log/entry" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/rendezvous" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/rendezvous" + "berty.tech/weshnet/v2/pkg/secretstore" ) type PeerDeviceGroup struct { diff --git a/message_marshaler_test.go b/message_marshaler_test.go index 4c761619..597c4013 100644 --- a/message_marshaler_test.go +++ b/message_marshaler_test.go @@ -11,8 +11,8 @@ import ( "berty.tech/go-ipfs-log/enc" "berty.tech/go-ipfs-log/entry" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/rendezvous" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/rendezvous" + "berty.tech/weshnet/v2/pkg/secretstore" ) var ( diff --git a/orbitdb.go b/orbitdb.go index ff72aadb..907050d0 100644 --- a/orbitdb.go +++ b/orbitdb.go @@ -28,12 +28,12 @@ import ( "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/pubsub/pubsubcoreapi" "berty.tech/go-orbit-db/stores" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/rendezvous" - "berty.tech/weshnet/pkg/secretstore" - "berty.tech/weshnet/pkg/tyber" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/rendezvous" + "berty.tech/weshnet/v2/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/tyber" ) type GroupOpenMode uint64 diff --git a/orbitdb_datastore_cache.go b/orbitdb_datastore_cache.go index 175a8c56..54a2195d 100644 --- a/orbitdb_datastore_cache.go +++ b/orbitdb_datastore_cache.go @@ -8,7 +8,7 @@ import ( "berty.tech/go-orbit-db/address" "berty.tech/go-orbit-db/cache" - "berty.tech/weshnet/internal/datastoreutil" + "berty.tech/weshnet/v2/internal/datastoreutil" ) type datastoreCache struct { diff --git a/orbitdb_many_adds_berty_test.go b/orbitdb_many_adds_berty_test.go index 768e67d0..8a1f6aa8 100644 --- a/orbitdb_many_adds_berty_test.go +++ b/orbitdb_many_adds_berty_test.go @@ -15,10 +15,10 @@ import ( "go.uber.org/zap" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/testutil" ) func testAddBerty(ctx context.Context, t *testing.T, node ipfsutil.CoreAPIMock, g *protocoltypes.Group, pathBase string, storageKey []byte, storageSalt []byte, amountToAdd, amountCurrentlyPresent int) { diff --git a/orbitdb_many_adds_test.go b/orbitdb_many_adds_test.go index 12b55f03..950d3b57 100644 --- a/orbitdb_many_adds_test.go +++ b/orbitdb_many_adds_test.go @@ -10,9 +10,9 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" orbitdb "berty.tech/go-orbit-db" - "berty.tech/weshnet/pkg/cryptoutil" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func TestAdd(t *testing.T) { diff --git a/orbitdb_signed_entry_accesscontroller.go b/orbitdb_signed_entry_accesscontroller.go index ea9eb52e..4c5ed9b3 100644 --- a/orbitdb_signed_entry_accesscontroller.go +++ b/orbitdb_signed_entry_accesscontroller.go @@ -14,7 +14,7 @@ import ( "berty.tech/go-ipfs-log/identityprovider" "berty.tech/go-orbit-db/accesscontroller" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) type simpleAccessController struct { diff --git a/orbitdb_signed_entry_identity_provider.go b/orbitdb_signed_entry_identity_provider.go index 8f276552..6aabdeb2 100644 --- a/orbitdb_signed_entry_identity_provider.go +++ b/orbitdb_signed_entry_identity_provider.go @@ -6,7 +6,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "berty.tech/go-ipfs-log/identityprovider" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) const ( diff --git a/orbitdb_signed_entry_keystore.go b/orbitdb_signed_entry_keystore.go index 0fc2eebf..94bd8425 100644 --- a/orbitdb_signed_entry_keystore.go +++ b/orbitdb_signed_entry_keystore.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "berty.tech/go-ipfs-log/keystore" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) type BertySignedKeyStore struct { diff --git a/orbitdb_test.go b/orbitdb_test.go index 85e8831e..6a33d880 100644 --- a/orbitdb_test.go +++ b/orbitdb_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "berty.tech/weshnet/internal/datastoreutil" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/testutil" - "berty.tech/weshnet/pkg/tinder" + "berty.tech/weshnet/v2/internal/datastoreutil" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/testutil" + "berty.tech/weshnet/v2/pkg/tinder" ) func TestDifferentStores(t *testing.T) { diff --git a/orbitdb_utils_test.go b/orbitdb_utils_test.go index 25577c9b..33a00238 100644 --- a/orbitdb_utils_test.go +++ b/orbitdb_utils_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func inviteAllPeersToGroup(ctx context.Context, t *testing.T, peers []*mockedPeer, groupSK crypto.PrivKey) { diff --git a/outofstoremessage_test.go b/outofstoremessage_test.go index a066678b..24a0eb18 100644 --- a/outofstoremessage_test.go +++ b/outofstoremessage_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/testutil" ) func Test_sealPushMessage_OutOfStoreReceive(t *testing.T) { diff --git a/pkg/androidnearby/bridge_android.go b/pkg/androidnearby/bridge_android.go index 8687ca2c..2d3d639f 100644 --- a/pkg/androidnearby/bridge_android.go +++ b/pkg/androidnearby/bridge_android.go @@ -6,7 +6,7 @@ package androidnearby import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) // Supported is used by main package as default value for enable this driver. diff --git a/pkg/androidnearby/bridge_unsupported.go b/pkg/androidnearby/bridge_unsupported.go index 6092f63f..04b75501 100644 --- a/pkg/androidnearby/bridge_unsupported.go +++ b/pkg/androidnearby/bridge_unsupported.go @@ -6,7 +6,7 @@ package androidnearby import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) const Supported = false diff --git a/pkg/bertyvcissuer/client.go b/pkg/bertyvcissuer/client.go index 2cd31c17..5d86cf0d 100644 --- a/pkg/bertyvcissuer/client.go +++ b/pkg/bertyvcissuer/client.go @@ -15,8 +15,8 @@ import ( "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" "github.com/piprate/json-gold/ld" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/verifiablecredstypes" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/verifiablecredstypes" ) const DefaultRedirectURI = "berty://vc" diff --git a/pkg/bertyvcissuer/verifiable_public_key_fetcher.go b/pkg/bertyvcissuer/verifiable_public_key_fetcher.go index 6c996a60..faa9c445 100644 --- a/pkg/bertyvcissuer/verifiable_public_key_fetcher.go +++ b/pkg/bertyvcissuer/verifiable_public_key_fetcher.go @@ -9,7 +9,7 @@ import ( "github.com/hyperledger/aries-framework-go/pkg/kms" "github.com/multiformats/go-multibase" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) func embeddedPublicKeyFetcher(issuerID string, allowList []string) (*verifier.PublicKey, error) { diff --git a/pkg/ble-driver/bridge_android.go b/pkg/ble-driver/bridge_android.go index 37d32a8d..647983e9 100644 --- a/pkg/ble-driver/bridge_android.go +++ b/pkg/ble-driver/bridge_android.go @@ -6,7 +6,7 @@ package ble import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) // Supported is used by main package as default value for enable the BLE driver. diff --git a/pkg/ble-driver/bridge_darwin.go b/pkg/ble-driver/bridge_darwin.go index f9dddbec..d76b0029 100644 --- a/pkg/ble-driver/bridge_darwin.go +++ b/pkg/ble-driver/bridge_darwin.go @@ -18,7 +18,7 @@ import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) const Supported = true diff --git a/pkg/ble-driver/bridge_unsupported.go b/pkg/ble-driver/bridge_unsupported.go index db74a689..109d317f 100644 --- a/pkg/ble-driver/bridge_unsupported.go +++ b/pkg/ble-driver/bridge_unsupported.go @@ -6,7 +6,7 @@ package ble import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) const Supported = false diff --git a/pkg/cryptoutil/cryptoutil.go b/pkg/cryptoutil/cryptoutil.go index 44e46caf..81f80abe 100644 --- a/pkg/cryptoutil/cryptoutil.go +++ b/pkg/cryptoutil/cryptoutil.go @@ -14,7 +14,7 @@ import ( "golang.org/x/crypto/ed25519" "golang.org/x/crypto/scrypt" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) const ( diff --git a/pkg/cryptoutil/cryptoutil_test.go b/pkg/cryptoutil/cryptoutil_test.go index 66274bac..83ee98f3 100644 --- a/pkg/cryptoutil/cryptoutil_test.go +++ b/pkg/cryptoutil/cryptoutil_test.go @@ -11,7 +11,7 @@ import ( "golang.org/x/crypto/curve25519" "golang.org/x/crypto/ed25519" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) // from: https://github.com/agl/ed25519/blob/5312a61534124124185d41f09206b9fef1d88403/extra25519/extra25519_test.go#L16-L30 diff --git a/pkg/ipfsutil/conn_logger.go b/pkg/ipfsutil/conn_logger.go index c0a7e566..607ebfab 100644 --- a/pkg/ipfsutil/conn_logger.go +++ b/pkg/ipfsutil/conn_logger.go @@ -10,7 +10,7 @@ import ( ma "github.com/multiformats/go-multiaddr" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) var ignoredTags = map[string]bool{ diff --git a/pkg/ipfsutil/helpers.go b/pkg/ipfsutil/helpers.go index 3e55ff84..ace72ad6 100644 --- a/pkg/ipfsutil/helpers.go +++ b/pkg/ipfsutil/helpers.go @@ -15,7 +15,7 @@ import ( "go.uber.org/multierr" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) func ParseAndResolveIpfsAddr(ctx context.Context, addr string) (*peer.AddrInfo, error) { diff --git a/pkg/ipfsutil/keystore_datastore.go b/pkg/ipfsutil/keystore_datastore.go index 56bab792..0bffd930 100644 --- a/pkg/ipfsutil/keystore_datastore.go +++ b/pkg/ipfsutil/keystore_datastore.go @@ -7,7 +7,7 @@ import ( keystore "github.com/ipfs/go-ipfs-keystore" "github.com/libp2p/go-libp2p/core/crypto" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) type datastoreKeystore struct { diff --git a/pkg/ipfsutil/lifecycle.go b/pkg/ipfsutil/lifecycle.go index 9e44a7a8..9d62e2cb 100644 --- a/pkg/ipfsutil/lifecycle.go +++ b/pkg/ipfsutil/lifecycle.go @@ -14,9 +14,9 @@ import ( "github.com/libp2p/go-libp2p/p2p/protocol/ping" "go.uber.org/zap" - "berty.tech/weshnet/pkg/lifecycle" - "berty.tech/weshnet/pkg/logutil" - "berty.tech/weshnet/pkg/netmanager" + "berty.tech/weshnet/v2/pkg/lifecycle" + "berty.tech/weshnet/v2/pkg/logutil" + "berty.tech/weshnet/v2/pkg/netmanager" ) var ( diff --git a/pkg/ipfsutil/localrecord.go b/pkg/ipfsutil/localrecord.go index 7955676d..7a46aea1 100644 --- a/pkg/ipfsutil/localrecord.go +++ b/pkg/ipfsutil/localrecord.go @@ -13,7 +13,7 @@ import ( mafmt "github.com/multiformats/go-multiaddr-fmt" manet "github.com/multiformats/go-multiaddr/net" - mc "berty.tech/weshnet/pkg/multipeer-connectivity-driver" + mc "berty.tech/weshnet/v2/pkg/multipeer-connectivity-driver" ) const recProtocolID = protocol.ID("wesh/p2p/localrecord") diff --git a/pkg/ipfsutil/mobile.go b/pkg/ipfsutil/mobile.go index df5c8105..a5e656d1 100644 --- a/pkg/ipfsutil/mobile.go +++ b/pkg/ipfsutil/mobile.go @@ -13,7 +13,7 @@ import ( host "github.com/libp2p/go-libp2p/core/host" p2p_routing "github.com/libp2p/go-libp2p/core/routing" - ipfs_mobile "berty.tech/weshnet/pkg/ipfsutil/mobile" + ipfs_mobile "berty.tech/weshnet/v2/pkg/ipfsutil/mobile" ) type DHTNetworkMode int diff --git a/pkg/ipfsutil/peering.go b/pkg/ipfsutil/peering.go index d9533857..a8db8405 100644 --- a/pkg/ipfsutil/peering.go +++ b/pkg/ipfsutil/peering.go @@ -15,7 +15,7 @@ import ( "github.com/multiformats/go-multiaddr" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) // Seed the random number generator. diff --git a/pkg/ipfsutil/pubsub_api.go b/pkg/ipfsutil/pubsub_api.go index e19c4542..92dc9fe7 100644 --- a/pkg/ipfsutil/pubsub_api.go +++ b/pkg/ipfsutil/pubsub_api.go @@ -10,7 +10,7 @@ import ( p2p_peer "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) type PubSubAPI struct { diff --git a/pkg/ipfsutil/pubsub_monitor.go b/pkg/ipfsutil/pubsub_monitor.go index 04ce7c45..8fd3b0a2 100644 --- a/pkg/ipfsutil/pubsub_monitor.go +++ b/pkg/ipfsutil/pubsub_monitor.go @@ -10,7 +10,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) // PubsubMonitor is an EventTracer diff --git a/pkg/ipfsutil/repo.go b/pkg/ipfsutil/repo.go index 0b31dd07..0771de75 100644 --- a/pkg/ipfsutil/repo.go +++ b/pkg/ipfsutil/repo.go @@ -16,7 +16,7 @@ import ( p2p_peer "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) // defaultConnMgrHighWater is the default value for the connection managers diff --git a/pkg/ipfsutil/testing.go b/pkg/ipfsutil/testing.go index 8b6c43b5..ab16b87d 100644 --- a/pkg/ipfsutil/testing.go +++ b/pkg/ipfsutil/testing.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - ipfs_mobile "berty.tech/weshnet/pkg/ipfsutil/mobile" - tinder "berty.tech/weshnet/pkg/tinder" + ipfs_mobile "berty.tech/weshnet/v2/pkg/ipfsutil/mobile" + tinder "berty.tech/weshnet/v2/pkg/tinder" ) // CoreAPIMock implements ipfs.CoreAPI and adds some debugging helpers diff --git a/pkg/lifecycle/manager.go b/pkg/lifecycle/manager.go index 1a14984a..98d7d271 100644 --- a/pkg/lifecycle/manager.go +++ b/pkg/lifecycle/manager.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "berty.tech/weshnet/internal/notify" + "berty.tech/weshnet/v2/internal/notify" ) type State int diff --git a/pkg/logutil/example_test.go b/pkg/logutil/example_test.go index 6ea68dc9..56797e3f 100644 --- a/pkg/logutil/example_test.go +++ b/pkg/logutil/example_test.go @@ -1,7 +1,7 @@ package logutil_test import ( - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) func Example_logall() { diff --git a/pkg/logutil/file.go b/pkg/logutil/file.go index cede76d0..55ec451a 100644 --- a/pkg/logutil/file.go +++ b/pkg/logutil/file.go @@ -14,7 +14,7 @@ import ( "go.uber.org/multierr" "moul.io/u" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) func newFileWriteCloser(target, kind string) (io.WriteCloser, error) { diff --git a/pkg/logutil/logutil.go b/pkg/logutil/logutil.go index 533b6c33..4258bf63 100644 --- a/pkg/logutil/logutil.go +++ b/pkg/logutil/logutil.go @@ -10,7 +10,7 @@ import ( "moul.io/u" "moul.io/zapfilter" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) const ( diff --git a/pkg/logutil/logutil_test.go b/pkg/logutil/logutil_test.go index ed2de470..ee42fa9e 100644 --- a/pkg/logutil/logutil_test.go +++ b/pkg/logutil/logutil_test.go @@ -13,7 +13,7 @@ import ( "moul.io/u" "moul.io/zapring" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) func TestTypeStd(t *testing.T) { diff --git a/pkg/multipeer-connectivity-driver/bridge_darwin.go b/pkg/multipeer-connectivity-driver/bridge_darwin.go index 4db977d6..18e4bb0a 100644 --- a/pkg/multipeer-connectivity-driver/bridge_darwin.go +++ b/pkg/multipeer-connectivity-driver/bridge_darwin.go @@ -6,8 +6,8 @@ package mc import ( "go.uber.org/zap" - native "berty.tech/weshnet/pkg/multipeer-connectivity-driver/driver" - proximity "berty.tech/weshnet/pkg/proximitytransport" + native "berty.tech/weshnet/v2/pkg/multipeer-connectivity-driver/driver" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) const Supported = true diff --git a/pkg/multipeer-connectivity-driver/bridge_unsupported.go b/pkg/multipeer-connectivity-driver/bridge_unsupported.go index eca23bd2..a7c2ce39 100644 --- a/pkg/multipeer-connectivity-driver/bridge_unsupported.go +++ b/pkg/multipeer-connectivity-driver/bridge_unsupported.go @@ -6,7 +6,7 @@ package mc import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) const Supported = false diff --git a/pkg/multipeer-connectivity-driver/driver/cgo_bridge.go b/pkg/multipeer-connectivity-driver/driver/cgo_bridge.go index a0bea046..9c5887b7 100644 --- a/pkg/multipeer-connectivity-driver/driver/cgo_bridge.go +++ b/pkg/multipeer-connectivity-driver/driver/cgo_bridge.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" - proximity "berty.tech/weshnet/pkg/proximitytransport" + proximity "berty.tech/weshnet/v2/pkg/proximitytransport" ) var ( diff --git a/pkg/netmanager/netmanager.go b/pkg/netmanager/netmanager.go index f0ff00f8..7c04b7b2 100644 --- a/pkg/netmanager/netmanager.go +++ b/pkg/netmanager/netmanager.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "berty.tech/weshnet/internal/notify" + "berty.tech/weshnet/v2/internal/notify" ) type NetManager struct { diff --git a/pkg/outofstoremessagetypes/outofstoremessage.pb.go b/pkg/outofstoremessagetypes/outofstoremessage.pb.go index 1f2b0ab2..b8d68e1c 100644 --- a/pkg/outofstoremessagetypes/outofstoremessage.pb.go +++ b/pkg/outofstoremessagetypes/outofstoremessage.pb.go @@ -7,7 +7,7 @@ package outofstoremessagetypes import ( - protocoltypes "berty.tech/weshnet/pkg/protocoltypes" + protocoltypes "berty.tech/weshnet/v2/pkg/protocoltypes" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/pkg/outofstoremessagetypes/outofstoremessage.pb.gw.go b/pkg/outofstoremessagetypes/outofstoremessage.pb.gw.go index 40f480d0..38ab2464 100644 --- a/pkg/outofstoremessagetypes/outofstoremessage.pb.gw.go +++ b/pkg/outofstoremessagetypes/outofstoremessage.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" diff --git a/pkg/outofstoremessagetypes/outofstoremessage_grpc.pb.go b/pkg/outofstoremessagetypes/outofstoremessage_grpc.pb.go index cfeb1049..86586e1b 100644 --- a/pkg/outofstoremessagetypes/outofstoremessage_grpc.pb.go +++ b/pkg/outofstoremessagetypes/outofstoremessage_grpc.pb.go @@ -7,7 +7,7 @@ package outofstoremessagetypes import ( - protocoltypes "berty.tech/weshnet/pkg/protocoltypes" + protocoltypes "berty.tech/weshnet/v2/pkg/protocoltypes" context "context" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/pkg/protocoltypes/contact.go b/pkg/protocoltypes/contact.go index 6d25bca0..2ca42c0d 100644 --- a/pkg/protocoltypes/contact.go +++ b/pkg/protocoltypes/contact.go @@ -5,7 +5,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) const RendezvousSeedLength = 32 diff --git a/pkg/protocoltypes/group.go b/pkg/protocoltypes/group.go index 472409ab..c5c40b63 100644 --- a/pkg/protocoltypes/group.go +++ b/pkg/protocoltypes/group.go @@ -10,8 +10,8 @@ import ( "golang.org/x/crypto/hkdf" "golang.org/x/crypto/sha3" - "berty.tech/weshnet/pkg/cryptoutil" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/errcode" ) func (m *Group) GetSigningPrivKey() (crypto.PrivKey, error) { diff --git a/pkg/proximitytransport/conn.go b/pkg/proximitytransport/conn.go index 60064ca9..8309ca6d 100644 --- a/pkg/proximitytransport/conn.go +++ b/pkg/proximitytransport/conn.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) // Conn is a manet.Conn. diff --git a/pkg/proximitytransport/mplex.go b/pkg/proximitytransport/mplex.go index ee7a73f5..320f63e7 100644 --- a/pkg/proximitytransport/mplex.go +++ b/pkg/proximitytransport/mplex.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) type mplex struct { diff --git a/pkg/proximitytransport/ringBuffer_map.go b/pkg/proximitytransport/ringBuffer_map.go index 29dcb167..58fbed4f 100644 --- a/pkg/proximitytransport/ringBuffer_map.go +++ b/pkg/proximitytransport/ringBuffer_map.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) // RingBufferMap is a map of string:ringBuffer(aka circular buffer) diff --git a/pkg/proximitytransport/transport.go b/pkg/proximitytransport/transport.go index aa401400..fbbd3da0 100644 --- a/pkg/proximitytransport/transport.go +++ b/pkg/proximitytransport/transport.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) // The ProximityTransport is a libp2p transport that initializes NativeDriver. diff --git a/pkg/rendezvous/emitterio_sync_test.go b/pkg/rendezvous/emitterio_sync_test.go index 601c80a6..3e1e370d 100644 --- a/pkg/rendezvous/emitterio_sync_test.go +++ b/pkg/rendezvous/emitterio_sync_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - berty_rendezvous "berty.tech/weshnet/pkg/rendezvous" + berty_rendezvous "berty.tech/weshnet/v2/pkg/rendezvous" ) func MakeRendezvousServiceTest(ctx context.Context, host host.Host, path string, rzs ...rendezvous.RendezvousSync) (*rendezvous.RendezvousService, error) { diff --git a/pkg/rendezvous/rendezvous_test.go b/pkg/rendezvous/rendezvous_test.go index e5353c03..77e79447 100644 --- a/pkg/rendezvous/rendezvous_test.go +++ b/pkg/rendezvous/rendezvous_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "berty.tech/weshnet/pkg/rendezvous" + "berty.tech/weshnet/v2/pkg/rendezvous" ) func TestRoundTimePeriod_Next(t *testing.T) { diff --git a/pkg/replicationtypes/bertyreplication.pb.go b/pkg/replicationtypes/bertyreplication.pb.go index 09e4622a..592a3eac 100644 --- a/pkg/replicationtypes/bertyreplication.pb.go +++ b/pkg/replicationtypes/bertyreplication.pb.go @@ -7,7 +7,7 @@ package replicationtypes import ( - protocoltypes "berty.tech/weshnet/pkg/protocoltypes" + protocoltypes "berty.tech/weshnet/v2/pkg/protocoltypes" _ "github.com/srikrsna/protoc-gen-gotag/tagger" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/pkg/replicationtypes/models.go b/pkg/replicationtypes/models.go index b4130f06..455c45aa 100644 --- a/pkg/replicationtypes/models.go +++ b/pkg/replicationtypes/models.go @@ -3,7 +3,7 @@ package replicationtypes import ( "encoding/base64" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func (m *ReplicatedGroup) ToGroup() (*protocoltypes.Group, error) { diff --git a/pkg/secretstore/chain_key.go b/pkg/secretstore/chain_key.go index e14fff70..1df12cf3 100644 --- a/pkg/secretstore/chain_key.go +++ b/pkg/secretstore/chain_key.go @@ -8,9 +8,9 @@ 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/protocoltypes" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) // newDeviceChainKey creates a new random chain key diff --git a/pkg/secretstore/datastore_keys.go b/pkg/secretstore/datastore_keys.go index 3da30c12..da0b6964 100644 --- a/pkg/secretstore/datastore_keys.go +++ b/pkg/secretstore/datastore_keys.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-datastore" "github.com/libp2p/go-libp2p/core/crypto" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) const ( diff --git a/pkg/secretstore/device_keystore_wrapper.go b/pkg/secretstore/device_keystore_wrapper.go index 88e3053b..f2a0f272 100644 --- a/pkg/secretstore/device_keystore_wrapper.go +++ b/pkg/secretstore/device_keystore_wrapper.go @@ -13,9 +13,9 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "go.uber.org/zap" - "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" ) const ( diff --git a/pkg/secretstore/device_keystore_wrapper_test.go b/pkg/secretstore/device_keystore_wrapper_test.go index 023f99fa..b3b1006c 100644 --- a/pkg/secretstore/device_keystore_wrapper_test.go +++ b/pkg/secretstore/device_keystore_wrapper_test.go @@ -7,8 +7,8 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/stretchr/testify/assert" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" ) func Test_New_AccountPrivKey_AccountProofPrivKey(t *testing.T) { diff --git a/pkg/secretstore/keys_utils.go b/pkg/secretstore/keys_utils.go index b1b78135..83896b95 100644 --- a/pkg/secretstore/keys_utils.go +++ b/pkg/secretstore/keys_utils.go @@ -12,9 +12,9 @@ import ( "golang.org/x/crypto/hkdf" "golang.org/x/crypto/sha3" - "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" ) // getEd25519PrivateKeyFromLibP2PFormattedBytes transforms an exported LibP2P diff --git a/pkg/secretstore/secret_store.go b/pkg/secretstore/secret_store.go index 422e6d5e..ddbd6e4e 100644 --- a/pkg/secretstore/secret_store.go +++ b/pkg/secretstore/secret_store.go @@ -13,11 +13,11 @@ import ( "golang.org/x/crypto/nacl/secretbox" "google.golang.org/protobuf/proto" - "berty.tech/weshnet/internal/datastoreutil" - "berty.tech/weshnet/pkg/cryptoutil" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/internal/datastoreutil" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) const ( diff --git a/pkg/secretstore/secret_store_interfaces.go b/pkg/secretstore/secret_store_interfaces.go index 9840187d..b0f5f6e5 100644 --- a/pkg/secretstore/secret_store_interfaces.go +++ b/pkg/secretstore/secret_store_interfaces.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "go.uber.org/zap" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) const ( diff --git a/pkg/secretstore/secret_store_messages.go b/pkg/secretstore/secret_store_messages.go index 08ce0369..973693c8 100644 --- a/pkg/secretstore/secret_store_messages.go +++ b/pkg/secretstore/secret_store_messages.go @@ -15,10 +15,10 @@ import ( "golang.org/x/crypto/nacl/secretbox" "google.golang.org/protobuf/proto" - "berty.tech/weshnet/pkg/cryptoutil" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/logutil" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/logutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) // decryptionContext contains context about a decrypted message, its CID, the diff --git a/pkg/secretstore/secret_store_messages_test.go b/pkg/secretstore/secret_store_messages_test.go index 1e650e81..780820bc 100644 --- a/pkg/secretstore/secret_store_messages_test.go +++ b/pkg/secretstore/secret_store_messages_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "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 addDummyMemberInMetadataStore(ctx context.Context, t testing.TB, ms *weshnet.MetadataStore, g *protocoltypes.Group, memberPK crypto.PubKey, join bool) crypto.PubKey { diff --git a/pkg/secretstore/secret_store_test.go b/pkg/secretstore/secret_store_test.go index 2fb674ef..6b3e2d77 100644 --- a/pkg/secretstore/secret_store_test.go +++ b/pkg/secretstore/secret_store_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func Test_PushGroupReferences(t *testing.T) { diff --git a/pkg/testutil/filters.go b/pkg/testutil/filters.go index 133e9fff..ccf5d638 100644 --- a/pkg/testutil/filters.go +++ b/pkg/testutil/filters.go @@ -5,7 +5,7 @@ import ( "google.golang.org/protobuf/proto" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func TestFilterGroupMetadataPayloadSent(t *testing.T, events <-chan *protocoltypes.GroupMetadataEvent) []*protocoltypes.GroupMetadataPayloadSent { diff --git a/pkg/testutil/logging.go b/pkg/testutil/logging.go index c4d6f739..9eab00a0 100644 --- a/pkg/testutil/logging.go +++ b/pkg/testutil/logging.go @@ -12,7 +12,7 @@ import ( "go.uber.org/zap" "moul.io/zapring" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) const defaultLoggingFilters = "info+:bty.test* error+:*,-ipfs*,-*.tyber" diff --git a/pkg/testutil/skip_test.go b/pkg/testutil/skip_test.go index cec51890..c4dcf747 100644 --- a/pkg/testutil/skip_test.go +++ b/pkg/testutil/skip_test.go @@ -3,7 +3,7 @@ package testutil_test import ( "testing" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/testutil" ) func TestFilterRace(t *testing.T) { diff --git a/pkg/tinder/driver_localdiscovery.go b/pkg/tinder/driver_localdiscovery.go index 892020f4..1d3d43b6 100644 --- a/pkg/tinder/driver_localdiscovery.go +++ b/pkg/tinder/driver_localdiscovery.go @@ -20,11 +20,11 @@ import ( manet "github.com/multiformats/go-multiaddr/net" "go.uber.org/zap" - nearby "berty.tech/weshnet/pkg/androidnearby" - ble "berty.tech/weshnet/pkg/ble-driver" - "berty.tech/weshnet/pkg/logutil" - mc "berty.tech/weshnet/pkg/multipeer-connectivity-driver" - "berty.tech/weshnet/pkg/protoio" + nearby "berty.tech/weshnet/v2/pkg/androidnearby" + ble "berty.tech/weshnet/v2/pkg/ble-driver" + "berty.tech/weshnet/v2/pkg/logutil" + mc "berty.tech/weshnet/v2/pkg/multipeer-connectivity-driver" + "berty.tech/weshnet/v2/pkg/protoio" ) const ( diff --git a/pkg/tinder/driver_localdiscovery_test.go b/pkg/tinder/driver_localdiscovery_test.go index 8da403a2..2d45c6a6 100644 --- a/pkg/tinder/driver_localdiscovery_test.go +++ b/pkg/tinder/driver_localdiscovery_test.go @@ -9,7 +9,7 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/testutil" ) func TestServiceLocalDiscorvery(t *testing.T) { diff --git a/pkg/tinder/driver_service_test.go b/pkg/tinder/driver_service_test.go index 737c433c..8a5dbf6f 100644 --- a/pkg/tinder/driver_service_test.go +++ b/pkg/tinder/driver_service_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/testutil" ) type testMakeDriver = func(t *testing.T, logger *zap.Logger, p host.Host) IDriver diff --git a/pkg/tinder/notify_network.go b/pkg/tinder/notify_network.go index 4aba7113..224133ba 100644 --- a/pkg/tinder/notify_network.go +++ b/pkg/tinder/notify_network.go @@ -10,8 +10,8 @@ import ( ma "github.com/multiformats/go-multiaddr" "go.uber.org/zap" - "berty.tech/weshnet/internal/notify" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/internal/notify" + "berty.tech/weshnet/v2/pkg/logutil" ) type AddrsFilter = bhost.AddrsFactory diff --git a/pkg/tinder/peer_cache.go b/pkg/tinder/peer_cache.go index 10e883ee..6c102b94 100644 --- a/pkg/tinder/peer_cache.go +++ b/pkg/tinder/peer_cache.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "berty.tech/weshnet/internal/notify" + "berty.tech/weshnet/v2/internal/notify" ) type PeersUpdate map[peer.ID]time.Time diff --git a/pkg/tinder/service.go b/pkg/tinder/service.go index 77f2120a..68c01619 100644 --- a/pkg/tinder/service.go +++ b/pkg/tinder/service.go @@ -10,7 +10,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) type Service struct { diff --git a/pkg/tinder/service_adaptater.go b/pkg/tinder/service_adaptater.go index 63231507..893b1b13 100644 --- a/pkg/tinder/service_adaptater.go +++ b/pkg/tinder/service_adaptater.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) var _ discovery.Discovery = (*DiscoveryAdaptater)(nil) diff --git a/pkg/tinder/service_advertises.go b/pkg/tinder/service_advertises.go index de365fa1..69cb4f15 100644 --- a/pkg/tinder/service_advertises.go +++ b/pkg/tinder/service_advertises.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" - "berty.tech/weshnet/pkg/logutil" + "berty.tech/weshnet/v2/pkg/logutil" ) const defaultTTL = time.Hour diff --git a/pkg/tinder/service_mocked_test.go b/pkg/tinder/service_mocked_test.go index d430460f..88dbfd29 100644 --- a/pkg/tinder/service_mocked_test.go +++ b/pkg/tinder/service_mocked_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/testutil" ) func TestMockedServiceSubscribeMultipleDriver(t *testing.T) { diff --git a/scenario_test.go b/scenario_test.go index ba0ec942..cc3f8aeb 100644 --- a/scenario_test.go +++ b/scenario_test.go @@ -19,10 +19,10 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - weshnet "berty.tech/weshnet" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/testutil" + weshnet "berty.tech/weshnet/v2" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/testutil" ) type testCase struct { diff --git a/service.go b/service.go index 51d1f1e5..d4ebbe1f 100644 --- a/service.go +++ b/service.go @@ -32,16 +32,16 @@ import ( "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/pubsub/directchannel" "berty.tech/go-orbit-db/pubsub/pubsubraw" - "berty.tech/weshnet/internal/bertyversion" - "berty.tech/weshnet/internal/datastoreutil" - "berty.tech/weshnet/pkg/bertyvcissuer" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/ipfsutil" - ipfs_mobile "berty.tech/weshnet/pkg/ipfsutil/mobile" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" - tinder "berty.tech/weshnet/pkg/tinder" - "berty.tech/weshnet/pkg/tyber" + "berty.tech/weshnet/v2/internal/bertyversion" + "berty.tech/weshnet/v2/internal/datastoreutil" + "berty.tech/weshnet/v2/pkg/bertyvcissuer" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/ipfsutil" + ipfs_mobile "berty.tech/weshnet/v2/pkg/ipfsutil/mobile" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" + tinder "berty.tech/weshnet/v2/pkg/tinder" + "berty.tech/weshnet/v2/pkg/tyber" ) var _ Service = (*service)(nil) diff --git a/service_client.go b/service_client.go index 7b4870ca..64ac2c7f 100644 --- a/service_client.go +++ b/service_client.go @@ -10,11 +10,11 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "berty.tech/weshnet/pkg/grpcutil" - "berty.tech/weshnet/pkg/ipfsutil" - ipfs_mobile "berty.tech/weshnet/pkg/ipfsutil/mobile" - "berty.tech/weshnet/pkg/logutil" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/grpcutil" + "berty.tech/weshnet/v2/pkg/ipfsutil" + ipfs_mobile "berty.tech/weshnet/v2/pkg/ipfsutil/mobile" + "berty.tech/weshnet/v2/pkg/logutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) const ( diff --git a/service_group.go b/service_group.go index 87ca3504..01094b73 100644 --- a/service_group.go +++ b/service_group.go @@ -8,9 +8,9 @@ import ( "go.uber.org/zap" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" ) func (s *service) getContactGroup(key crypto.PubKey) (*protocoltypes.Group, error) { diff --git a/service_outofstoremessage.go b/service_outofstoremessage.go index 47a4e30b..5657ee76 100644 --- a/service_outofstoremessage.go +++ b/service_outofstoremessage.go @@ -12,11 +12,11 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/grpcutil" - "berty.tech/weshnet/pkg/outofstoremessagetypes" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/grpcutil" + "berty.tech/weshnet/v2/pkg/outofstoremessagetypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" ) type OOSMService interface { diff --git a/store_message.go b/store_message.go index a79c6ddb..0e50c3c4 100644 --- a/store_message.go +++ b/store_message.go @@ -23,11 +23,11 @@ import ( "berty.tech/go-orbit-db/stores" "berty.tech/go-orbit-db/stores/basestore" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/logutil" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" - "berty.tech/weshnet/pkg/tyber" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/logutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/tyber" ) // FIXME: replace cache by a circular buffer to avoid an attack by RAM saturation diff --git a/store_message_metrics.go b/store_message_metrics.go index a455aaa9..b9f0b63e 100644 --- a/store_message_metrics.go +++ b/store_message_metrics.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "berty.tech/weshnet/internal/queue" + "berty.tech/weshnet/v2/internal/queue" ) const messageMetricNamespace = "bty_store_message" diff --git a/store_message_queue.go b/store_message_queue.go index 4ef07536..69553d94 100644 --- a/store_message_queue.go +++ b/store_message_queue.go @@ -4,8 +4,8 @@ import ( "github.com/ipfs/go-cid" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/weshnet/internal/queue" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/internal/queue" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) // An Item is something we manage in a priority queue. diff --git a/store_message_test.go b/store_message_test.go index ddab0703..4830a93c 100644 --- a/store_message_test.go +++ b/store_message_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" ipfslog "berty.tech/go-ipfs-log" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/testutil" ) func countEntries(out <-chan *protocoltypes.GroupMessageEvent) int { diff --git a/store_metadata.go b/store_metadata.go index 5beb595f..2e1d4ed1 100644 --- a/store_metadata.go +++ b/store_metadata.go @@ -23,10 +23,10 @@ import ( "berty.tech/go-orbit-db/stores" "berty.tech/go-orbit-db/stores/basestore" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" - "berty.tech/weshnet/pkg/tyber" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/tyber" ) type MetadataStore struct { diff --git a/store_metadata_index.go b/store_metadata_index.go index 5b03d733..a3fc3e87 100644 --- a/store_metadata_index.go +++ b/store_metadata_index.go @@ -11,10 +11,10 @@ import ( ipfslog "berty.tech/go-ipfs-log" "berty.tech/go-orbit-db/iface" - "berty.tech/weshnet/pkg/cryptoutil" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/secretstore" + "berty.tech/weshnet/v2/pkg/cryptoutil" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/secretstore" ) // FIXME: replace members, devices, sentSecrets, contacts and groups by a circular buffer to avoid an attack by RAM saturation diff --git a/store_metadata_test.go b/store_metadata_test.go index 7df4e187..624192ce 100644 --- a/store_metadata_test.go +++ b/store_metadata_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/protocoltypes" - "berty.tech/weshnet/pkg/testutil" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/testutil" ) func TestMetadataStoreSecret_Basic(t *testing.T) { diff --git a/store_options.go b/store_options.go index 38c10022..40ba80f9 100644 --- a/store_options.go +++ b/store_options.go @@ -9,8 +9,8 @@ import ( "berty.tech/go-ipfs-log/identityprovider" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/accesscontroller" - "berty.tech/weshnet/pkg/errcode" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/errcode" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func DefaultOrbitDBOptions(g *protocoltypes.Group, options *orbitdb.CreateDBOptions, keystore *BertySignedKeyStore, storeType string, groupOpenMode GroupOpenMode) (*orbitdb.CreateDBOptions, error) { diff --git a/store_utils.go b/store_utils.go index 1abed84c..e145a1fd 100644 --- a/store_utils.go +++ b/store_utils.go @@ -5,7 +5,7 @@ import ( "errors" ipliface "berty.tech/go-ipfs-log/iface" - "berty.tech/weshnet/pkg/errcode" + "berty.tech/weshnet/v2/pkg/errcode" ) func getEntriesInRange(entries []ipliface.IPFSLogEntry, since, until []byte) ([]ipliface.IPFSLogEntry, error) { diff --git a/testing.go b/testing.go index 4ad63a18..d2a281e6 100644 --- a/testing.go +++ b/testing.go @@ -29,13 +29,13 @@ import ( encrepo "berty.tech/go-ipfs-repo-encrypted" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/pubsub/pubsubraw" - "berty.tech/weshnet/internal/datastoreutil" - "berty.tech/weshnet/pkg/errcode" - "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/internal/datastoreutil" + "berty.tech/weshnet/v2/pkg/errcode" + "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" ) const InMemoryDir = ":memory:" diff --git a/testing_test.go b/testing_test.go index 0b36b8b8..7fa8ab25 100644 --- a/testing_test.go +++ b/testing_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "berty.tech/weshnet/pkg/protocoltypes" + "berty.tech/weshnet/v2/pkg/protocoltypes" ) func TestClient_impl(t *testing.T) { diff --git a/tinder_swiper.go b/tinder_swiper.go index 6afbceb4..074b4207 100644 --- a/tinder_swiper.go +++ b/tinder_swiper.go @@ -15,10 +15,10 @@ import ( "go.uber.org/zap" "moul.io/srand" - "berty.tech/weshnet/pkg/logutil" - "berty.tech/weshnet/pkg/rendezvous" - tinder "berty.tech/weshnet/pkg/tinder" - "berty.tech/weshnet/pkg/tyber" + "berty.tech/weshnet/v2/pkg/logutil" + "berty.tech/weshnet/v2/pkg/rendezvous" + tinder "berty.tech/weshnet/v2/pkg/tinder" + "berty.tech/weshnet/v2/pkg/tyber" ) type swiperRequest struct { diff --git a/tinder_swiper_test.go b/tinder_swiper_test.go index 62da9b44..4f79a1c1 100644 --- a/tinder_swiper_test.go +++ b/tinder_swiper_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "berty.tech/weshnet/pkg/ipfsutil" - "berty.tech/weshnet/pkg/rendezvous" - "berty.tech/weshnet/pkg/testutil" - "berty.tech/weshnet/pkg/tinder" + "berty.tech/weshnet/v2/pkg/ipfsutil" + "berty.tech/weshnet/v2/pkg/rendezvous" + "berty.tech/weshnet/v2/pkg/testutil" + "berty.tech/weshnet/v2/pkg/tinder" ) func TestAnnounceWatchForPeriod(t *testing.T) {