From d9e9184befd44856a73468cc204a2e1c21c4af78 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Fri, 20 Dec 2019 19:02:22 +0100 Subject: [PATCH] chore: migrate berty.tech to berty.tech/berty --- .buildkite/pipeline.yml | 12 +- .gitignore | 10 - README.md | 2 +- api/bertyprotocol.proto | 2 +- api/errcode.proto | 2 +- api/go-internal/handshake.proto | 2 +- api/go-internal/protocolmodel.proto | 2 +- api/go-internal/sigchain.proto | 2 +- api/go-internal/store_entry.proto | 2 +- .../com_github_libp2p_go_openssl.BUILD.bzl | 2 +- ...m_github_spacemonkeygo_openssl.BUILD.bazel | 2 +- docs/Makefile | 4 +- docs/gen.sum | 6 +- go/BUILD.bazel | 4 +- go/Dockerfile | 2 +- go/Makefile | 4 +- go/cmd/berty/main.go | 8 +- go/framework/bpbridge/bridge.go | 6 +- go/framework/bpbridge/bridge_test.go | 6 +- go/framework/bpbridge/client.go | 2 +- go/framework/bpbridge/doc.go | 2 +- go/gen.sum | 14 +- go/go.mod | 2 +- go/internal/crypto/crypto.go | 2 +- go/internal/crypto/crypto_module.go | 2 +- go/internal/crypto/crypto_sigchain.go | 2 +- go/internal/crypto/crypto_sigchain_entry.go | 2 +- go/internal/crypto/sigchain.pb.go | 61 ++--- go/internal/gormutil/doc.go | 2 +- go/internal/gormutil/utils.go | 2 +- go/internal/group/demo/cfg.go | 2 +- go/internal/group/demo/cmd.go | 8 +- go/internal/group/doc.go | 4 +- go/internal/group/group.go | 2 +- go/internal/group/invitation.go | 2 +- go/internal/group/member_entry_payload.go | 2 +- go/internal/group/setting_entry_payload.go | 2 +- go/internal/group/store_entry.go | 2 +- go/internal/group/store_entry.pb.go | 95 ++++---- go/internal/handshake/crypto_module.go | 4 +- go/internal/handshake/crypto_session.go | 4 +- go/internal/handshake/crypto_test.go | 4 +- go/internal/handshake/handshake.pb.go | 62 ++--- go/internal/handshake/net_flow.go | 4 +- go/internal/handshake/net_flow_test.go | 4 +- .../handshake/net_step_1_2_key_agreement.go | 2 +- .../handshake/net_step_3_auth_challenge.go | 2 +- .../net_step_4_5_sigchain_exchange.go | 4 +- go/internal/handshake/net_utils.go | 2 +- go/internal/ipfsutil/api_configurable.go | 2 +- go/internal/ipfsutil/api_inmemory.go | 2 +- go/internal/ipfsutil/mdns_discovery.go | 2 +- go/internal/orbitutil/doc.go | 4 +- go/internal/orbitutil/group_context.go | 4 +- .../signed_entry_identity_provider.go | 2 +- .../identityberty/signed_entry_keystore.go | 2 +- go/internal/orbitutil/orbitdb.go | 14 +- .../orbitutil/orbittestutil/orbittestutil.go | 6 +- go/internal/orbitutil/orbitutilapi/api.go | 2 +- .../storegroup/default_store_opts.go | 6 +- go/internal/orbitutil/storegroup/store.go | 4 +- .../orbitutil/storemember/member_store.go | 8 +- .../storemember/member_store_index.go | 8 +- .../storemember/member_store_test.go | 10 +- .../orbitutil/storesetting/settings_store.go | 8 +- .../storesetting/settings_store_index.go | 6 +- .../storesetting/settings_store_test.go | 16 +- go/internal/protocoldb/datastore.go | 4 +- go/internal/protocoldb/datastore_test.go | 6 +- go/internal/protocoldb/doc.go | 2 +- go/internal/protocoldb/migrations/doc.go | 2 +- .../protocoldb/migrations/migrations.go | 4 +- go/internal/protocoldb/protocolmodel.pb.go | 199 ++++++++-------- go/internal/protocoldb/protocolmodel_test.go | 2 +- go/internal/testutil/doc.go | 2 +- go/pkg/bertyprotocol/api_app.go | 2 +- go/pkg/bertyprotocol/api_client.go | 2 +- go/pkg/bertyprotocol/api_contact.go | 2 +- go/pkg/bertyprotocol/api_contactrequest.go | 2 +- go/pkg/bertyprotocol/api_device.go | 2 +- go/pkg/bertyprotocol/api_event.go | 2 +- go/pkg/bertyprotocol/api_group.go | 2 +- go/pkg/bertyprotocol/bertyprotocol.pb.go | 220 +++++++++--------- go/pkg/bertyprotocol/client.go | 6 +- go/pkg/bertyprotocol/doc.go | 2 +- go/pkg/bertyprotocol/testing.go | 4 +- go/pkg/bertyprotocol/testing_test.go | 2 +- go/pkg/errcode/doc.go | 2 +- go/pkg/errcode/errcode.pb.go | 72 +++--- js/packages/react-native-chat-sdk/Makefile | 4 +- test/experiment/BUILD.bazel | 2 +- test/experiment/dht/BUILD.bazel | 2 +- .../experiment/dht/src/bittorrent/BUILD.bazel | 2 +- test/experiment/dht/src/bittorrent/dht.go | 2 +- test/experiment/dht/src/chord/BUILD.bazel | 2 +- test/experiment/dht/src/chord/dht.go | 2 +- test/experiment/dht/src/gnunet/BUILD.bazel | 2 +- test/experiment/dht/src/gnunet/dht.go | 2 +- test/experiment/dht/src/libp2p/BUILD.bazel | 2 +- test/experiment/dht/src/libp2p/dht.go | 2 +- test/experiment/dht/src/matrix/BUILD.bazel | 2 +- test/experiment/dht/src/matrix/dht.go | 2 +- test/experiment/dht/src/opendht/BUILD.bazel | 2 +- test/experiment/dht/src/opendht/dht.go | 2 +- test/experiment/dht/test/basic_test.go | 12 +- test/experiment/go.mod | 2 +- test/experiment/scw/add-service.yaml | 2 +- test/experiment/scw/run-daemon.yaml | 2 +- 108 files changed, 539 insertions(+), 544 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 47e262b014..176d7966f8 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -12,7 +12,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/protoc:22 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty environment: ["GO111MODULE=on", "GOPATH=/go"] volumes: ["~/go/pkg/mod:/go/pkg/mod"] commands: @@ -35,7 +35,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/githooks:v1 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty environment: ["GO111MODULE=on", "GOPATH=/go"] commands: - set -x @@ -49,7 +49,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/protoc:22 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty environment: ["GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent"] volumes: ["~:/home/buildkite-agent", "~/go/pkg/mod:/go/pkg/mod"] @@ -70,7 +70,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/protoc:22 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty environment: ["GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent"] volumes: ["~:/home/buildkite-agent", "~/go/pkg/mod:/go/pkg/mod"] @@ -86,7 +86,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/build-go:v2 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty propagate-environment: true environment: [ @@ -125,7 +125,7 @@ steps: - n0izn0iz/docker#v3.5.4: image: bertytech/bazel:2.0.0-buster-r0 propagate-uid-gid: true - workdir: /go/src/berty.tech + workdir: /go/src/berty.tech/berty environment: [ "GO111MODULE=on", diff --git a/.gitignore b/.gitignore index acabc7eac4..76fca49ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,4 @@ gen.sum.tmp -# berty package -/crew/ -/depviz/ -/go-ipfs-log/ -/go-libp2p-ble-transport/ -/go-orbit-db/ -/gomobile-ipfs/ -/gomobile-react-bridge/ -/protocol/ -/zero-push/ # junk profile.out diff --git a/README.md b/README.md index b6ca61b5bb..695fc77a88 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ CodeFactor GitHub version - GoDoc + GoDoc

diff --git a/api/bertyprotocol.proto b/api/bertyprotocol.proto index 8cf1b0ac9a..40099b00df 100644 --- a/api/bertyprotocol.proto +++ b/api/bertyprotocol.proto @@ -4,7 +4,7 @@ package berty.protocol; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option go_package = "berty.tech/go/pkg/bertyprotocol"; +option go_package = "berty.tech/berty/go/pkg/bertyprotocol"; // ProtocolService is the top-level API to manage an instance of the Berty Protocol. // Each Berty Protocol Instance is considered as a Berty device and is associated with a Berty user. diff --git a/api/errcode.proto b/api/errcode.proto index ae60c29731..790465605d 100644 --- a/api/errcode.proto +++ b/api/errcode.proto @@ -4,7 +4,7 @@ package berty.errcode; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option go_package = "berty.tech/go/pkg/errcode"; +option go_package = "berty.tech/berty/go/pkg/errcode"; option (gogoproto.goproto_enum_prefix_all) = false; diff --git a/api/go-internal/handshake.proto b/api/go-internal/handshake.proto index c688389250..dc790d8f37 100644 --- a/api/go-internal/handshake.proto +++ b/api/go-internal/handshake.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package handshake; -option go_package = "berty.tech/go/internal/handshake"; +option go_package = "berty.tech/berty/go/internal/handshake"; import "go-internal/sigchain.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/api/go-internal/protocolmodel.proto b/api/go-internal/protocolmodel.proto index 9f09a6f690..98f8175aa1 100644 --- a/api/go-internal/protocolmodel.proto +++ b/api/go-internal/protocolmodel.proto @@ -5,7 +5,7 @@ package berty.protocolmodel; import "github.com/golang/protobuf/ptypes/timestamp/timestamp.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option go_package = "berty.tech/go/internal/protocoldb"; +option go_package = "berty.tech/berty/go/internal/protocoldb"; option (gogoproto.goproto_unkeyed_all) = false; option (gogoproto.goproto_sizecache_all) = false; diff --git a/api/go-internal/sigchain.proto b/api/go-internal/sigchain.proto index 69ffff6106..6f9361449d 100644 --- a/api/go-internal/sigchain.proto +++ b/api/go-internal/sigchain.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "berty.tech/go/internal/crypto"; +option go_package = "berty.tech/berty/go/internal/crypto"; import "google/protobuf/timestamp.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/api/go-internal/store_entry.proto b/api/go-internal/store_entry.proto index 99f33b6232..65bf09b22e 100644 --- a/api/go-internal/store_entry.proto +++ b/api/go-internal/store_entry.proto @@ -4,7 +4,7 @@ package berty.group; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option go_package = "berty.tech/go/internal/group"; +option go_package = "berty.tech/berty/go/internal/group"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; option (gogoproto.sizer_all) = true; diff --git a/build/bazel/com_github_libp2p_go_openssl.BUILD.bzl b/build/bazel/com_github_libp2p_go_openssl.BUILD.bzl index a4444495aa..17ffa350a3 100644 --- a/build/bazel/com_github_libp2p_go_openssl.BUILD.bzl +++ b/build/bazel/com_github_libp2p_go_openssl.BUILD.bzl @@ -56,7 +56,7 @@ go_library( ], "//conditions:default": [], }), - importmap = "berty.tech/go/vendor/github.com/libp2p/go-openssl", + importmap = "berty.tech/berty/go/vendor/github.com/libp2p/go-openssl", importpath = "github.com/libp2p/go-openssl", visibility = ["//visibility:public"], deps = [ diff --git a/build/bazel/com_github_spacemonkeygo_openssl.BUILD.bazel b/build/bazel/com_github_spacemonkeygo_openssl.BUILD.bazel index 23adebae0b..90605dcb55 100644 --- a/build/bazel/com_github_spacemonkeygo_openssl.BUILD.bazel +++ b/build/bazel/com_github_spacemonkeygo_openssl.BUILD.bazel @@ -55,7 +55,7 @@ go_library( ], "//conditions:default": [], }), - importmap = "berty.tech/go/vendor/github.com/spacemonkeygo/openssl", + importmap = "berty.tech/berty/go/vendor/github.com/spacemonkeygo/openssl", importpath = "github.com/spacemonkeygo/openssl", visibility = ["//visibility:public"], deps = [ diff --git a/docs/Makefile b/docs/Makefile index 87b6b6617d..c351e4147d 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -21,8 +21,8 @@ $(GEN_SUM): $(GEN_SRC) (set -e; cd ../go && GO111MODULE=on go mod vendor); \ docker run \ --user=`id -u` \ - --volume="$(PWD)/..:/go/src/berty.tech" \ - --workdir="/go/src/berty.tech/docs" \ + --volume="$(PWD)/..:/go/src/berty.tech/berty" \ + --workdir="/go/src/berty.tech/berty/docs" \ --entrypoint="sh" \ --rm \ bertytech/protoc:22 \ diff --git a/docs/gen.sum b/docs/gen.sum index 2fb5de35f8..19df4517e6 100644 --- a/docs/gen.sum +++ b/docs/gen.sum @@ -1,3 +1,3 @@ -4812405654c86b1067a4be0ba43c397e2d1c7895 ../api/bertyprotocol.proto -a94e93bd575baf9e7d1d10ef2f97b361aa557e38 ../api/errcode.proto -ed902b86019bde9358d5742fb9fccbc9c0e4fa6d Makefile +28c496e3e801a1f576324a2116268e56479e16aa ../api/bertyprotocol.proto +cebe16fc76c594cb18c075942bf4a5bc0c736810 ../api/errcode.proto +1c7b51893d167ee9946ed5d2a539a9d73887ed21 Makefile diff --git a/go/BUILD.bazel b/go/BUILD.bazel index bbdc42ae53..1896a2013c 100644 --- a/go/BUILD.bazel +++ b/go/BUILD.bazel @@ -1,6 +1,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle") -# gazelle:prefix berty.tech/go +# gazelle:prefix berty.tech/berty/go # gazelle:proto disable_global gazelle( name = "gazelle", @@ -17,5 +17,5 @@ golangcilint( "pkg/...", "internal/...", ], - prefix = "berty.tech/go", + prefix = "berty.tech/berty/go", ) diff --git a/go/Dockerfile b/go/Dockerfile index 9b252a92fe..68e6b18694 100644 --- a/go/Dockerfile +++ b/go/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.13.5-alpine as builder RUN apk add --no-cache git gcc musl-dev make ENV GO111MODULE=on -WORKDIR /go/src/berty.tech/go +WORKDIR /go/src/berty.tech/berty/go COPY go.* ./ RUN go mod download COPY . ./ diff --git a/go/Makefile b/go/Makefile index fd0754eac8..b7aeb0ae62 100644 --- a/go/Makefile +++ b/go/Makefile @@ -198,8 +198,8 @@ $(GEN_SUM): $(GEN_SRC) $(GO) mod vendor; \ docker run \ --user="$$uid" \ - --volume="$(PWD)/..:/go/src/berty.tech" \ - --workdir="/go/src/berty.tech/go" \ + --volume="$(PWD)/..:/go/src/berty.tech/berty" \ + --workdir="/go/src/berty.tech/berty/go" \ --entrypoint="sh" \ --rm \ bertytech/protoc:22 \ diff --git a/go/cmd/berty/main.go b/go/cmd/berty/main.go index e677977c80..049d3fe014 100644 --- a/go/cmd/berty/main.go +++ b/go/cmd/berty/main.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "berty.tech/go/internal/banner" - "berty.tech/go/internal/grpcutil" - "berty.tech/go/pkg/bertyprotocol" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/banner" + "berty.tech/berty/go/internal/grpcutil" + "berty.tech/berty/go/pkg/bertyprotocol" + "berty.tech/berty/go/pkg/errcode" "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/sqlite" // required by gorm ma "github.com/multiformats/go-multiaddr" diff --git a/go/framework/bpbridge/bridge.go b/go/framework/bpbridge/bridge.go index 4a36fadc03..44d060c566 100644 --- a/go/framework/bpbridge/bridge.go +++ b/go/framework/bpbridge/bridge.go @@ -11,9 +11,9 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" // required by gorm "github.com/pkg/errors" - "berty.tech/go/internal/grpcutil" - "berty.tech/go/pkg/bertyprotocol" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/grpcutil" + "berty.tech/berty/go/pkg/bertyprotocol" + "berty.tech/berty/go/pkg/errcode" "github.com/improbable-eng/grpc-web/go/grpcweb" "github.com/jinzhu/gorm" diff --git a/go/framework/bpbridge/bridge_test.go b/go/framework/bpbridge/bridge_test.go index 21b5a01c8b..469ab981b1 100644 --- a/go/framework/bpbridge/bridge_test.go +++ b/go/framework/bpbridge/bridge_test.go @@ -13,9 +13,9 @@ import ( "net/textproto" "testing" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/testutil" - "berty.tech/go/pkg/bertyprotocol" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/testutil" + "berty.tech/berty/go/pkg/bertyprotocol" "github.com/gogo/protobuf/proto" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/go/framework/bpbridge/client.go b/go/framework/bpbridge/client.go index 432dc7684d..6dc1d81496 100644 --- a/go/framework/bpbridge/client.go +++ b/go/framework/bpbridge/client.go @@ -3,7 +3,7 @@ package bpbridge import ( "context" - "berty.tech/go/internal/grpcutil" + "berty.tech/berty/go/internal/grpcutil" "google.golang.org/grpc" ) diff --git a/go/framework/bpbridge/doc.go b/go/framework/bpbridge/doc.go index c6fbc4cc69..8de629c2a2 100644 --- a/go/framework/bpbridge/doc.go +++ b/go/framework/bpbridge/doc.go @@ -1 +1 @@ -package bpbridge // import "berty.tech/go/framework/bpbridge" +package bpbridge // import "berty.tech/berty/go/framework/bpbridge" diff --git a/go/gen.sum b/go/gen.sum index 05ed517549..9f863ceda0 100644 --- a/go/gen.sum +++ b/go/gen.sum @@ -1,7 +1,7 @@ -4812405654c86b1067a4be0ba43c397e2d1c7895 ../api/bertyprotocol.proto -a94e93bd575baf9e7d1d10ef2f97b361aa557e38 ../api/errcode.proto -d915a30248e7105cb1290f5798382ccf0bdb935a ../api/go-internal/handshake.proto -9709a68db024f0b73121062e7b07c925d1d3f5c0 ../api/go-internal/protocolmodel.proto -e90229dbdbf76864981801538947a192cb62b448 ../api/go-internal/sigchain.proto -013dcdd574cefc0c541688c493133f0d9be39341 ../api/go-internal/store_entry.proto -b5550102b6902bb68cf2f879fd1d55f262c583a8 Makefile +28c496e3e801a1f576324a2116268e56479e16aa ../api/bertyprotocol.proto +cebe16fc76c594cb18c075942bf4a5bc0c736810 ../api/errcode.proto +dcbee8a9b345330615f4e517e711bb5c38b22248 ../api/go-internal/handshake.proto +365bc276a7d8ccc215a0779a08aaa5cfb3fbe43e ../api/go-internal/protocolmodel.proto +2bd227219a1d918ec6fe121c2d85fa6d1ffa116c ../api/go-internal/sigchain.proto +3a3befa3103deb046a2377f480cfc24229da97a4 ../api/go-internal/store_entry.proto +f4c2bc91af60c8b2560e3e78de0b78bcc770726a Makefile diff --git a/go/go.mod b/go/go.mod index 8192395e84..7bb6869eb6 100644 --- a/go/go.mod +++ b/go/go.mod @@ -1,4 +1,4 @@ -module berty.tech/go +module berty.tech/berty/go go 1.13 diff --git a/go/internal/crypto/crypto.go b/go/internal/crypto/crypto.go index c3e25ff35b..a1b85eb5bd 100644 --- a/go/internal/crypto/crypto.go +++ b/go/internal/crypto/crypto.go @@ -3,7 +3,7 @@ package crypto import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" "go.uber.org/zap" ) diff --git a/go/internal/crypto/crypto_module.go b/go/internal/crypto/crypto_module.go index 92f50e8d86..2f136bc28a 100644 --- a/go/internal/crypto/crypto_module.go +++ b/go/internal/crypto/crypto_module.go @@ -8,7 +8,7 @@ import ( "encoding/binary" "time" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" "go.uber.org/zap" ) diff --git a/go/internal/crypto/crypto_sigchain.go b/go/internal/crypto/crypto_sigchain.go index f9f6f80e2f..cd4b0562f5 100644 --- a/go/internal/crypto/crypto_sigchain.go +++ b/go/internal/crypto/crypto_sigchain.go @@ -3,7 +3,7 @@ package crypto import ( "time" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" "go.uber.org/zap" ) diff --git a/go/internal/crypto/crypto_sigchain_entry.go b/go/internal/crypto/crypto_sigchain_entry.go index e9eac53f93..82f57ce39b 100644 --- a/go/internal/crypto/crypto_sigchain_entry.go +++ b/go/internal/crypto/crypto_sigchain_entry.go @@ -1,7 +1,7 @@ package crypto import ( - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" mh "github.com/multiformats/go-multihash" ) diff --git a/go/internal/crypto/sigchain.pb.go b/go/internal/crypto/sigchain.pb.go index 139818992b..3985951cef 100644 --- a/go/internal/crypto/sigchain.pb.go +++ b/go/internal/crypto/sigchain.pb.go @@ -226,37 +226,38 @@ func init() { func init() { proto.RegisterFile("go-internal/sigchain.proto", fileDescriptor_f58137636cf153ac) } var fileDescriptor_f58137636cf153ac = []byte{ - // 479 bytes of a gzipped FileDescriptorProto + // 481 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0xbb, 0x4e, 0x49, 0x93, 0x0d, 0x6d, 0xd3, 0x15, 0x50, 0x2b, 0xd0, 0xc4, 0xca, 0xc9, - 0x02, 0xd5, 0x96, 0x82, 0x10, 0xe7, 0x24, 0x44, 0x6a, 0x55, 0x0e, 0xc8, 0x94, 0x0b, 0x17, 0xcb, - 0x1f, 0xd3, 0xf5, 0x42, 0xb2, 0x6b, 0xad, 0xd7, 0x08, 0xbf, 0x45, 0x1f, 0xab, 0x47, 0x78, 0x81, - 0x82, 0xf2, 0x24, 0xc8, 0xeb, 0x38, 0x10, 0x92, 0x4b, 0x6f, 0x33, 0xf3, 0x9b, 0xff, 0x8c, 0x3d, - 0x33, 0x8b, 0x7b, 0x54, 0x9c, 0x33, 0xae, 0x40, 0xf2, 0x60, 0xee, 0x66, 0x8c, 0x46, 0x49, 0xc0, - 0xb8, 0x93, 0x4a, 0xa1, 0x44, 0x6f, 0x40, 0x85, 0xa0, 0x73, 0x70, 0xb5, 0x17, 0xe6, 0x37, 0xae, - 0x62, 0x0b, 0xc8, 0x54, 0xb0, 0x48, 0x57, 0x09, 0xe7, 0x94, 0xa9, 0x24, 0x0f, 0x9d, 0x48, 0x2c, - 0x5c, 0x2a, 0xa8, 0xf8, 0x9b, 0x59, 0x7a, 0xda, 0xd1, 0x56, 0x95, 0x3e, 0xfc, 0xb9, 0x8f, 0x0f, - 0x3f, 0x32, 0x3a, 0x2d, 0x5b, 0xcc, 0xb8, 0x92, 0x05, 0x39, 0xc3, 0x18, 0x4a, 0xc3, 0x4f, 0x82, - 0x2c, 0x31, 0x91, 0x85, 0xec, 0xc7, 0x5e, 0x5b, 0x47, 0x2e, 0x82, 0x2c, 0x21, 0x17, 0xf8, 0xb8, - 0xc2, 0xaa, 0x48, 0xc1, 0x8f, 0x44, 0x0c, 0xa6, 0x61, 0x21, 0xfb, 0x68, 0x64, 0x39, 0x1b, 0x75, - 0x36, 0xbd, 0xeb, 0x22, 0x05, 0xef, 0x10, 0x6a, 0x73, 0x2a, 0x62, 0x20, 0x2f, 0xf1, 0x49, 0x1a, - 0x48, 0xe0, 0xca, 0xff, 0xa7, 0x5f, 0x43, 0xf7, 0x3b, 0xae, 0xc0, 0x6c, 0xdd, 0x75, 0x8a, 0x71, - 0x24, 0x21, 0x50, 0x10, 0xfb, 0x81, 0x32, 0xf7, 0x2d, 0x64, 0x77, 0x46, 0x3d, 0xa7, 0x9a, 0x85, - 0x53, 0xff, 0xa1, 0x73, 0x5d, 0xcf, 0x62, 0xd2, 0xba, 0xbb, 0x1f, 0xec, 0xdd, 0xfe, 0x1a, 0x20, - 0xaf, 0xbd, 0xd2, 0x8d, 0x15, 0x99, 0xe1, 0x0e, 0x7c, 0x4f, 0x99, 0x64, 0x9c, 0x96, 0x55, 0x1e, - 0x3d, 0xa0, 0x0a, 0xae, 0x85, 0x63, 0x45, 0xde, 0xe0, 0xd3, 0x8c, 0x51, 0x0e, 0xd2, 0x4f, 0xf3, - 0x70, 0xce, 0x22, 0xff, 0x2b, 0x14, 0x7e, 0x58, 0x28, 0xc8, 0xcc, 0xa6, 0xfe, 0xfa, 0x27, 0x15, - 0xfe, 0xa0, 0xe9, 0x15, 0x14, 0x93, 0x92, 0x91, 0xb7, 0xd8, 0xcc, 0xf2, 0xf0, 0x0b, 0x44, 0x6a, - 0x5b, 0x77, 0xa0, 0x75, 0x4f, 0x57, 0xfc, 0x3f, 0xe1, 0x0b, 0xdc, 0x2e, 0x0b, 0x06, 0x2a, 0x97, - 0x60, 0xb6, 0xaa, 0x7d, 0xac, 0x03, 0xc3, 0x5b, 0x84, 0x4f, 0xb6, 0x46, 0x4d, 0xfa, 0xb8, 0xb7, - 0x15, 0xfc, 0xc4, 0x63, 0xb8, 0x61, 0x1c, 0xe2, 0xee, 0xde, 0x4e, 0x7e, 0xc9, 0x99, 0xd2, 0x91, - 0x2e, 0x22, 0xcf, 0xf1, 0xe9, 0x16, 0x1f, 0xc7, 0xf1, 0x15, 0x14, 0x5d, 0x63, 0xa7, 0xd8, 0x83, - 0x85, 0xf8, 0x06, 0x25, 0x6f, 0x0c, 0xdf, 0xe3, 0x56, 0xcd, 0xc9, 0x33, 0x6c, 0xb0, 0xb8, 0xba, - 0xa2, 0x49, 0x73, 0x79, 0x3f, 0x30, 0x2e, 0xdf, 0x79, 0x06, 0x8b, 0x89, 0x8d, 0x0f, 0xca, 0xad, - 0x33, 0xc8, 0x4c, 0xc3, 0x6a, 0xd8, 0x9d, 0xd1, 0xd1, 0xe6, 0xc1, 0x78, 0x35, 0x9e, 0xbc, 0xba, - 0x5b, 0xf6, 0xd1, 0x8f, 0x65, 0x1f, 0xfd, 0x5e, 0xf6, 0xd1, 0xe7, 0xb3, 0x10, 0xa4, 0x2a, 0x1c, - 0x05, 0x51, 0xe2, 0x52, 0xe1, 0xae, 0x9f, 0x49, 0x24, 0x8b, 0x54, 0x89, 0xb0, 0xa9, 0xb7, 0xf8, - 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0xe1, 0x53, 0xe0, 0x43, 0x03, 0x00, 0x00, + 0x10, 0xc7, 0xbb, 0x4e, 0x49, 0x93, 0x0d, 0x6d, 0xd3, 0x15, 0x50, 0x2b, 0x40, 0x62, 0x85, 0x8b, + 0x85, 0x54, 0x5b, 0x04, 0x21, 0xce, 0x49, 0x88, 0xd4, 0xaa, 0x1c, 0x90, 0x29, 0x17, 0x2e, 0x96, + 0x3f, 0xa6, 0xeb, 0x85, 0x64, 0xd7, 0x5a, 0xaf, 0x11, 0x7e, 0x8b, 0x3e, 0x56, 0x8f, 0xf0, 0x02, + 0x05, 0xe5, 0x49, 0x90, 0xd7, 0x71, 0x20, 0x24, 0x97, 0xde, 0x66, 0xe6, 0x37, 0xff, 0x19, 0x7b, + 0x66, 0x16, 0xf7, 0xa8, 0x38, 0x63, 0x5c, 0x81, 0xe4, 0xc1, 0xdc, 0xcd, 0x18, 0x8d, 0x92, 0x80, + 0x71, 0x27, 0x95, 0x42, 0x89, 0xde, 0x80, 0x0a, 0x41, 0xe7, 0xe0, 0x6a, 0x2f, 0xcc, 0xaf, 0x5d, + 0xc5, 0x16, 0x90, 0xa9, 0x60, 0x91, 0xae, 0x12, 0xce, 0x28, 0x53, 0x49, 0x1e, 0x3a, 0x91, 0x58, + 0xb8, 0x54, 0x50, 0xf1, 0x37, 0xb3, 0xf4, 0xb4, 0xa3, 0xad, 0x2a, 0x7d, 0xf8, 0x73, 0x1f, 0x1f, + 0x7e, 0x64, 0x74, 0x5a, 0xb6, 0x98, 0x71, 0x25, 0x0b, 0xf2, 0x1c, 0x63, 0x28, 0x0d, 0x3f, 0x09, + 0xb2, 0xc4, 0x44, 0x16, 0xb2, 0x1f, 0x7a, 0x6d, 0x1d, 0x39, 0x0f, 0xb2, 0x84, 0x9c, 0xe3, 0xe3, + 0x0a, 0xab, 0x22, 0x05, 0x3f, 0x12, 0x31, 0x98, 0x86, 0x85, 0xec, 0xa3, 0x91, 0xe5, 0x6c, 0xd4, + 0xd9, 0xf4, 0xae, 0x8a, 0x14, 0xbc, 0x43, 0xa8, 0xcd, 0xa9, 0x88, 0x81, 0xbc, 0xc4, 0x27, 0x69, + 0x20, 0x81, 0x2b, 0xff, 0x9f, 0x7e, 0x0d, 0xdd, 0xef, 0xb8, 0x02, 0xb3, 0x75, 0xd7, 0x29, 0xc6, + 0x91, 0x84, 0x40, 0x41, 0xec, 0x07, 0xca, 0xdc, 0xb7, 0x90, 0xdd, 0x19, 0xf5, 0x9c, 0x6a, 0x16, + 0x4e, 0xfd, 0x87, 0xce, 0x55, 0x3d, 0x8b, 0x49, 0xeb, 0xf6, 0x6e, 0xb0, 0x77, 0xf3, 0x6b, 0x80, + 0xbc, 0xf6, 0x4a, 0x37, 0x56, 0x64, 0x86, 0x3b, 0xf0, 0x3d, 0x65, 0x92, 0x71, 0x5a, 0x56, 0x79, + 0x70, 0x8f, 0x2a, 0xb8, 0x16, 0x8e, 0x15, 0x79, 0x83, 0x4f, 0x33, 0x46, 0x39, 0x48, 0x3f, 0xcd, + 0xc3, 0x39, 0x8b, 0xfc, 0xaf, 0x50, 0xf8, 0x61, 0xa1, 0x20, 0x33, 0x9b, 0xfa, 0xeb, 0x1f, 0x55, + 0xf8, 0x83, 0xa6, 0x97, 0x50, 0x4c, 0x4a, 0x46, 0xde, 0x62, 0x33, 0xcb, 0xc3, 0x2f, 0x10, 0xa9, + 0x6d, 0xdd, 0x81, 0xd6, 0x3d, 0x5e, 0xf1, 0xff, 0x84, 0xcf, 0x70, 0xbb, 0x2c, 0x18, 0xa8, 0x5c, + 0x82, 0xd9, 0xaa, 0xf6, 0xb1, 0x0e, 0x0c, 0x6f, 0x10, 0x3e, 0xd9, 0x1a, 0x35, 0xe9, 0xe3, 0xde, + 0x56, 0xf0, 0x13, 0x8f, 0xe1, 0x9a, 0x71, 0x88, 0xbb, 0x7b, 0x3b, 0xf9, 0x05, 0x67, 0x4a, 0x47, + 0xba, 0x88, 0x3c, 0xc5, 0xa7, 0x5b, 0x7c, 0x1c, 0xc7, 0x97, 0x50, 0x74, 0x8d, 0x9d, 0x62, 0x0f, + 0x16, 0xe2, 0x1b, 0x94, 0xbc, 0x31, 0x7c, 0x8f, 0x5b, 0x35, 0x27, 0x4f, 0xb0, 0xc1, 0xe2, 0xea, + 0x8a, 0x26, 0xcd, 0xe5, 0xdd, 0xc0, 0xb8, 0x78, 0xe7, 0x19, 0x2c, 0x26, 0x36, 0x3e, 0x28, 0xb7, + 0xce, 0x20, 0x33, 0x0d, 0xab, 0x61, 0x77, 0x46, 0x47, 0x9b, 0x07, 0xe3, 0xd5, 0x78, 0xf2, 0xea, + 0x76, 0xd9, 0x47, 0x3f, 0x96, 0x7d, 0xf4, 0x7b, 0xd9, 0x47, 0x9f, 0x5f, 0x84, 0x20, 0x55, 0xe1, + 0x28, 0x88, 0x12, 0x57, 0x9b, 0x2e, 0x15, 0xee, 0xfa, 0xb1, 0x44, 0xb2, 0x48, 0x95, 0x08, 0x9b, + 0x7a, 0x97, 0xaf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x74, 0xf6, 0x0e, 0x49, 0x03, 0x00, + 0x00, } func (m *SigChainEntry) Marshal() (dAtA []byte, err error) { diff --git a/go/internal/gormutil/doc.go b/go/internal/gormutil/doc.go index dd21453b5a..aae87ef7f0 100644 --- a/go/internal/gormutil/doc.go +++ b/go/internal/gormutil/doc.go @@ -1 +1 @@ -package gormutil // import "berty.tech/go/internal/gormutil" +package gormutil // import "berty.tech/berty/go/internal/gormutil" diff --git a/go/internal/gormutil/utils.go b/go/internal/gormutil/utils.go index 64891a9fa3..4bd7b69ccb 100644 --- a/go/internal/gormutil/utils.go +++ b/go/internal/gormutil/utils.go @@ -3,7 +3,7 @@ package gormutil import ( "github.com/jinzhu/gorm" "go.uber.org/zap" - "gopkg.in/gormigrate.v1" + gormigrate "gopkg.in/gormigrate.v1" ) // Init configures an active gorm connection diff --git a/go/internal/group/demo/cfg.go b/go/internal/group/demo/cfg.go index b9d50ee494..0f9dbcfdc1 100644 --- a/go/internal/group/demo/cfg.go +++ b/go/internal/group/demo/cfg.go @@ -6,7 +6,7 @@ import ( "fmt" "math/big" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ipfs_datastore "github.com/ipfs/go-datastore" ipfs_datastoresync "github.com/ipfs/go-datastore/sync" ipfs_cfg "github.com/ipfs/go-ipfs-config" diff --git a/go/internal/group/demo/cmd.go b/go/internal/group/demo/cmd.go index 94a279a811..458621045c 100644 --- a/go/internal/group/demo/cmd.go +++ b/go/internal/group/demo/cmd.go @@ -9,13 +9,13 @@ import ( "path" "sync" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/orbitutil" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/events" "berty.tech/go-orbit-db/stores" - "berty.tech/go/internal/group" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/orbitutil" - "berty.tech/go/internal/orbitutil/orbitutilapi" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/group/doc.go b/go/internal/group/doc.go index 982311ed58..42049181f7 100644 --- a/go/internal/group/doc.go +++ b/go/internal/group/doc.go @@ -1,2 +1,2 @@ -// group contains structs and helpers functions to manage a Berty protocol group -package group // import "berty.tech/go/internal/group" +// Package group contains structs and helpers functions to manage a Berty protocol group +package group // import "berty.tech/berty/go/internal/group" diff --git a/go/internal/group/group.go b/go/internal/group/group.go index 22ba228eec..c2717ca4d1 100644 --- a/go/internal/group/group.go +++ b/go/internal/group/group.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "encoding/hex" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/group/invitation.go b/go/internal/group/invitation.go index 6db93b7a2d..8819f23c4c 100644 --- a/go/internal/group/invitation.go +++ b/go/internal/group/invitation.go @@ -5,7 +5,7 @@ import ( "golang.org/x/crypto/ed25519" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" pb "github.com/libp2p/go-libp2p-core/crypto/pb" ) diff --git a/go/internal/group/member_entry_payload.go b/go/internal/group/member_entry_payload.go index 35a3aec54c..fe3f3edd5c 100644 --- a/go/internal/group/member_entry_payload.go +++ b/go/internal/group/member_entry_payload.go @@ -1,7 +1,7 @@ package group import ( - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/group/setting_entry_payload.go b/go/internal/group/setting_entry_payload.go index 97621a3931..014553d7e5 100644 --- a/go/internal/group/setting_entry_payload.go +++ b/go/internal/group/setting_entry_payload.go @@ -1,7 +1,7 @@ package group import ( - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/group/store_entry.go b/go/internal/group/store_entry.go index 5a245c7e36..94e121c86c 100644 --- a/go/internal/group/store_entry.go +++ b/go/internal/group/store_entry.go @@ -1,7 +1,7 @@ package group import ( - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/gogo/protobuf/proto" "github.com/libp2p/go-libp2p-core/crypto" "golang.org/x/crypto/nacl/secretbox" diff --git a/go/internal/group/store_entry.pb.go b/go/internal/group/store_entry.pb.go index 50927142de..fbb351f4ff 100644 --- a/go/internal/group/store_entry.pb.go +++ b/go/internal/group/store_entry.pb.go @@ -648,53 +648,54 @@ func init() { func init() { proto.RegisterFile("go-internal/store_entry.proto", fileDescriptor_588070fb2e1cba7f) } var fileDescriptor_588070fb2e1cba7f = []byte{ - // 736 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x4e, 0x7f, 0xd4, 0x49, 0xda, 0xba, 0x9b, 0xa6, 0x4d, 0x69, 0x28, 0x60, 0x38, 0x40, - 0x69, 0x12, 0xb5, 0x95, 0xe0, 0x08, 0x54, 0xad, 0x10, 0xaa, 0x2a, 0x55, 0x09, 0x20, 0xc4, 0xc5, - 0xb5, 0xe3, 0xc1, 0xb5, 0x9a, 0x78, 0x2d, 0x7b, 0x6d, 0x64, 0xf1, 0x04, 0x1c, 0x90, 0x78, 0x0b, - 0x6e, 0x3c, 0x07, 0x47, 0x1e, 0x01, 0xf5, 0x49, 0x90, 0x77, 0xed, 0x78, 0x9d, 0x04, 0xe8, 0x29, - 0xde, 0x6f, 0xe6, 0xdb, 0x6f, 0x32, 0xfe, 0x66, 0x0c, 0x77, 0x1c, 0xda, 0x76, 0x3d, 0x86, 0x81, - 0x67, 0x0e, 0xbb, 0x21, 0xa3, 0x01, 0x1a, 0xe8, 0xb1, 0x20, 0xe9, 0xf8, 0x01, 0x65, 0x94, 0x54, - 0x2d, 0x0c, 0x58, 0xd2, 0x71, 0x02, 0x1a, 0xf9, 0xb7, 0xdb, 0x8e, 0xcb, 0x2e, 0x23, 0xab, 0x33, - 0xa0, 0xa3, 0xae, 0x43, 0x1d, 0xda, 0xe5, 0x39, 0x56, 0xf4, 0x91, 0x9f, 0xf8, 0x81, 0x3f, 0x09, - 0xae, 0x7e, 0x01, 0xf5, 0x7e, 0x7a, 0xe1, 0x89, 0x37, 0x08, 0x12, 0x9f, 0xa1, 0x7d, 0x92, 0x5e, - 0x4c, 0x9e, 0xc0, 0x1a, 0xe6, 0x88, 0xe1, 0x9b, 0xc9, 0x90, 0x9a, 0x76, 0x53, 0xb9, 0xa7, 0x3c, - 0xaa, 0xf5, 0xb4, 0x71, 0xe0, 0x5c, 0xe0, 0xa4, 0x05, 0x4b, 0xa1, 0xeb, 0x78, 0x26, 0x8b, 0x02, - 0x6c, 0xaa, 0x3c, 0xa9, 0x00, 0xf4, 0x6f, 0x15, 0x20, 0x67, 0x38, 0xb2, 0x30, 0xe0, 0x57, 0xe7, - 0xa4, 0x87, 0xb0, 0x32, 0xe2, 0xa8, 0xe1, 0x47, 0x96, 0x71, 0x85, 0x49, 0x76, 0x7d, 0x4d, 0xa0, - 0xe7, 0x91, 0x75, 0x8a, 0x09, 0x79, 0x06, 0xcd, 0x72, 0x96, 0x31, 0xa9, 0xd4, 0x90, 0xf3, 0xfb, - 0x79, 0x90, 0xec, 0x43, 0x16, 0x30, 0x6c, 0x8c, 0xdd, 0x01, 0x8e, 0x55, 0x2a, 0x9c, 0x45, 0x44, - 0xf0, 0x98, 0xc7, 0x32, 0xad, 0x63, 0xb8, 0x3b, 0x93, 0x22, 0x49, 0xce, 0x71, 0xf2, 0xf6, 0x34, - 0xb9, 0x10, 0x3e, 0x84, 0x0d, 0xd7, 0x8b, 0x5d, 0x36, 0xad, 0x3c, 0xcf, 0xc9, 0xf5, 0x2c, 0x5a, - 0x92, 0xde, 0x03, 0xc2, 0x61, 0x93, 0xb9, 0xd4, 0x1b, 0x13, 0x16, 0x44, 0xbf, 0x8b, 0x48, 0x96, - 0xfd, 0x1c, 0x5a, 0xd3, 0xd9, 0x52, 0x95, 0x8b, 0x9c, 0xb7, 0x35, 0xc9, 0x1b, 0xd7, 0xa8, 0x7f, - 0x86, 0xf5, 0x33, 0x0c, 0x43, 0xd3, 0x41, 0xfe, 0x4a, 0x4e, 0xbc, 0x18, 0x87, 0xd4, 0x47, 0xd2, - 0x84, 0xc5, 0x01, 0x8d, 0x52, 0xa3, 0xf1, 0x97, 0x31, 0xd7, 0xcb, 0x8f, 0xb3, 0xfd, 0xa0, 0xde, - 0xc4, 0x0f, 0x95, 0x49, 0x3f, 0x7c, 0x55, 0xa1, 0x2e, 0xab, 0xe7, 0xac, 0x17, 0x30, 0xc7, 0x12, - 0x1f, 0xb9, 0xf2, 0xca, 0xc1, 0x5e, 0x47, 0x32, 0x75, 0x67, 0x46, 0x7e, 0x27, 0xfb, 0x7d, 0x93, - 0xf8, 0xd8, 0xe3, 0x4c, 0x72, 0x1f, 0x6a, 0x23, 0x91, 0x68, 0x58, 0xd4, 0x4e, 0xb2, 0xfa, 0xaa, - 0x19, 0x76, 0x44, 0xed, 0xd4, 0x4f, 0x50, 0xb4, 0x85, 0xd7, 0x56, 0x3d, 0xd8, 0x2c, 0x49, 0xbd, - 0x1e, 0x87, 0x7b, 0x52, 0xaa, 0xfe, 0x1e, 0xaa, 0x92, 0x20, 0xd9, 0x00, 0x22, 0x1d, 0xdf, 0x7a, - 0x57, 0x1e, 0xfd, 0xe4, 0x69, 0xb7, 0x26, 0xf0, 0xac, 0x6c, 0x4d, 0x21, 0x5b, 0xd0, 0x90, 0xf0, - 0x42, 0x43, 0x53, 0xf5, 0xef, 0x2a, 0x40, 0x01, 0xfc, 0xc3, 0x3f, 0xca, 0xdf, 0xfd, 0xd3, 0x81, - 0xba, 0xec, 0x88, 0xc0, 0x8d, 0x39, 0x43, 0x34, 0x60, 0x4d, 0x32, 0x42, 0xe0, 0xc6, 0x37, 0x71, - 0x50, 0xe5, 0x3f, 0x0e, 0x22, 0x0f, 0x60, 0x99, 0xb7, 0xcb, 0x88, 0x31, 0x08, 0xd3, 0x56, 0xa6, - 0x93, 0xb1, 0xdc, 0xab, 0x71, 0xf0, 0x9d, 0xc0, 0x88, 0x9e, 0x27, 0x95, 0x27, 0xa0, 0xca, 0xc1, - 0xac, 0xf2, 0x5d, 0x58, 0x13, 0x39, 0xa9, 0xb8, 0xeb, 0x39, 0x92, 0xf1, 0x57, 0x79, 0xa0, 0x2f, - 0xf0, 0x53, 0x4c, 0xf4, 0x1f, 0x0a, 0x90, 0x3e, 0x0e, 0x02, 0x64, 0x25, 0xe3, 0xb4, 0xa1, 0x6e, - 0x63, 0xc8, 0x8c, 0x99, 0xeb, 0x44, 0x4b, 0x43, 0x67, 0xf2, 0x4a, 0xd9, 0x87, 0x46, 0x88, 0x9e, - 0x3d, 0xdd, 0x5f, 0xd1, 0x2d, 0x22, 0x82, 0xa5, 0xf6, 0x3e, 0x85, 0xcd, 0xc2, 0xfd, 0x19, 0x2b, - 0xe4, 0x85, 0x64, 0x9d, 0x6a, 0x8c, 0xc3, 0x82, 0x27, 0xaa, 0xd4, 0xfb, 0x50, 0x93, 0xcf, 0xe4, - 0x31, 0x68, 0x36, 0x06, 0x6e, 0x2c, 0xda, 0x1e, 0x32, 0x93, 0x61, 0x56, 0xe6, 0x6a, 0x81, 0xf7, - 0x53, 0x58, 0x1e, 0x45, 0xb5, 0x34, 0x8a, 0xfa, 0x17, 0x15, 0xd6, 0xfb, 0xc8, 0x98, 0xeb, 0x39, - 0x61, 0xa9, 0x0f, 0x2f, 0x4b, 0x03, 0xd4, 0x2e, 0xb9, 0x7a, 0x16, 0x61, 0xc6, 0x04, 0x4d, 0x2f, - 0x65, 0x75, 0xc6, 0x52, 0xd6, 0xa0, 0x92, 0x6f, 0xd2, 0xa5, 0x5e, 0xfa, 0x48, 0xd6, 0x61, 0x3e, - 0x36, 0x87, 0x51, 0xbe, 0x20, 0xc5, 0x41, 0xbf, 0xb8, 0xd9, 0xcc, 0x6c, 0xc3, 0xa6, 0x84, 0xbf, - 0xe2, 0x2f, 0x5d, 0x94, 0xab, 0x29, 0xa4, 0x05, 0xcd, 0xd2, 0x40, 0xa5, 0x65, 0xe4, 0x51, 0xf5, - 0x68, 0xf7, 0xe7, 0xf5, 0x8e, 0xf2, 0xeb, 0x7a, 0x47, 0xf9, 0x7d, 0xbd, 0xa3, 0x7c, 0x68, 0x89, - 0x7f, 0xcc, 0x70, 0x70, 0xd9, 0x75, 0x68, 0x77, 0xfc, 0xc5, 0xe4, 0x2d, 0xb0, 0x16, 0xf8, 0x07, - 0xef, 0xf0, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x43, 0x2a, 0x54, 0x03, 0x4d, 0x07, 0x00, 0x00, + // 741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xd3, 0x4a, + 0x10, 0x3e, 0x76, 0xfa, 0xa3, 0x4e, 0xd2, 0xd6, 0xdd, 0x34, 0x6d, 0x7a, 0xda, 0xd3, 0x03, 0x86, + 0x0b, 0x7e, 0x9a, 0x84, 0xb6, 0x12, 0x5c, 0x02, 0x55, 0x2b, 0x84, 0xaa, 0x4a, 0x55, 0x02, 0x08, + 0x71, 0xe3, 0xda, 0xf1, 0xe0, 0x5a, 0x4d, 0xbc, 0x96, 0xbd, 0x36, 0xb2, 0x78, 0x02, 0x2e, 0x90, + 0x78, 0x0b, 0xee, 0x78, 0x0e, 0x2e, 0x79, 0x04, 0xd4, 0x27, 0x41, 0xde, 0xb5, 0xe3, 0x75, 0x62, + 0xa0, 0x57, 0xf1, 0x7e, 0x33, 0xdf, 0x7e, 0x93, 0xf1, 0x37, 0x63, 0xf8, 0xcf, 0xa1, 0x1d, 0xd7, + 0x63, 0x18, 0x78, 0xe6, 0xa8, 0x17, 0x32, 0x1a, 0xa0, 0x81, 0x1e, 0x0b, 0x92, 0xae, 0x1f, 0x50, + 0x46, 0x49, 0xdd, 0xc2, 0x80, 0x25, 0x5d, 0x27, 0xa0, 0x91, 0xff, 0x6f, 0xc7, 0x71, 0xd9, 0x65, + 0x64, 0x75, 0x87, 0x74, 0xdc, 0x73, 0xa8, 0x43, 0x7b, 0x3c, 0xc7, 0x8a, 0xde, 0xf3, 0x13, 0x3f, + 0xf0, 0x27, 0xc1, 0xd5, 0x2f, 0xa0, 0x39, 0x48, 0x2f, 0x3c, 0xf1, 0x86, 0x41, 0xe2, 0x33, 0xb4, + 0x4f, 0xd2, 0x8b, 0xc9, 0x43, 0x58, 0xc3, 0x1c, 0x31, 0x7c, 0x33, 0x19, 0x51, 0xd3, 0x6e, 0x2b, + 0xb7, 0x94, 0x7b, 0x8d, 0xbe, 0x36, 0x09, 0x9c, 0x0b, 0x9c, 0xec, 0xc0, 0x52, 0xe8, 0x3a, 0x9e, + 0xc9, 0xa2, 0x00, 0xdb, 0x2a, 0x4f, 0x2a, 0x00, 0xfd, 0x4b, 0x0d, 0xc8, 0x19, 0x8e, 0x2d, 0x0c, + 0xf8, 0xd5, 0x39, 0xe9, 0x2e, 0xac, 0x8c, 0x39, 0x6a, 0xf8, 0x91, 0x65, 0x5c, 0x61, 0x92, 0x5d, + 0xdf, 0x10, 0xe8, 0x79, 0x64, 0x9d, 0x62, 0x42, 0x9e, 0x40, 0xbb, 0x9c, 0x65, 0x4c, 0x2b, 0xb5, + 0xe4, 0xfc, 0x41, 0x1e, 0x24, 0xfb, 0x90, 0x05, 0x0c, 0x1b, 0x63, 0x77, 0x88, 0x13, 0x95, 0x1a, + 0x67, 0x11, 0x11, 0x3c, 0xe6, 0xb1, 0x4c, 0xeb, 0x18, 0xfe, 0xaf, 0xa4, 0x48, 0x92, 0x73, 0x9c, + 0xbc, 0x3d, 0x4b, 0x2e, 0x84, 0x0f, 0x61, 0xc3, 0xf5, 0x62, 0x97, 0xcd, 0x2a, 0xcf, 0x73, 0x72, + 0x33, 0x8b, 0x96, 0xa4, 0xf7, 0x80, 0x70, 0xd8, 0x64, 0x2e, 0xf5, 0x26, 0x84, 0x05, 0xd1, 0xef, + 0x22, 0x92, 0x65, 0x3f, 0x85, 0x9d, 0xd9, 0x6c, 0xa9, 0xca, 0x45, 0xce, 0xdb, 0x9a, 0xe6, 0x4d, + 0x6a, 0xd4, 0x3f, 0xc2, 0xfa, 0x19, 0x86, 0xa1, 0xe9, 0x20, 0x7f, 0x25, 0x27, 0x5e, 0x8c, 0x23, + 0xea, 0x23, 0x69, 0xc3, 0xe2, 0x90, 0x46, 0xa9, 0xd1, 0xf8, 0xcb, 0x98, 0xeb, 0xe7, 0xc7, 0x6a, + 0x3f, 0xa8, 0x37, 0xf1, 0x43, 0x6d, 0xda, 0x0f, 0x9f, 0x55, 0x68, 0xca, 0xea, 0x39, 0xeb, 0x19, + 0xcc, 0xb1, 0xc4, 0x47, 0xae, 0xbc, 0x72, 0xb0, 0xd7, 0x95, 0x4c, 0xdd, 0xad, 0xc8, 0xef, 0x66, + 0xbf, 0xaf, 0x12, 0x1f, 0xfb, 0x9c, 0x49, 0x6e, 0x43, 0x63, 0x2c, 0x12, 0x0d, 0x8b, 0xda, 0x49, + 0x56, 0x5f, 0x3d, 0xc3, 0x8e, 0xa8, 0x9d, 0xfa, 0x09, 0x8a, 0xb6, 0xf0, 0xda, 0xea, 0x07, 0x9b, + 0x25, 0xa9, 0x97, 0x93, 0x70, 0x5f, 0x4a, 0xd5, 0xdf, 0x42, 0x5d, 0x12, 0x24, 0x1b, 0x40, 0xa4, + 0xe3, 0x6b, 0xef, 0xca, 0xa3, 0x1f, 0x3c, 0xed, 0x9f, 0x29, 0x3c, 0x2b, 0x5b, 0x53, 0xc8, 0x16, + 0xb4, 0x24, 0xbc, 0xd0, 0xd0, 0x54, 0xfd, 0xab, 0x0a, 0x50, 0x00, 0x7f, 0xf0, 0x8f, 0xf2, 0x7b, + 0xff, 0x74, 0xa1, 0x29, 0x3b, 0x22, 0x70, 0x63, 0xce, 0x10, 0x0d, 0x58, 0x93, 0x8c, 0x10, 0xb8, + 0xf1, 0x4d, 0x1c, 0x54, 0xfb, 0x8b, 0x83, 0xc8, 0x1d, 0x58, 0xe6, 0xed, 0x32, 0x62, 0x0c, 0xc2, + 0xb4, 0x95, 0xe9, 0x64, 0x2c, 0xf7, 0x1b, 0x1c, 0x7c, 0x23, 0x30, 0xa2, 0xe7, 0x49, 0xe5, 0x09, + 0xa8, 0x73, 0x30, 0xab, 0xfc, 0x01, 0xac, 0x89, 0x9c, 0x54, 0xdc, 0xf5, 0x1c, 0xc9, 0xf8, 0xab, + 0x3c, 0x30, 0x10, 0xf8, 0x29, 0x26, 0xfa, 0x37, 0x05, 0xc8, 0x00, 0x87, 0x01, 0xb2, 0x92, 0x71, + 0x3a, 0xd0, 0xb4, 0x31, 0x64, 0x46, 0xe5, 0x3a, 0xd1, 0xd2, 0xd0, 0x99, 0xbc, 0x52, 0xf6, 0xa1, + 0x15, 0xa2, 0x67, 0xcf, 0xf6, 0x57, 0x74, 0x8b, 0x88, 0x60, 0xa9, 0xbd, 0x8f, 0x61, 0xb3, 0x70, + 0x7f, 0xc6, 0x0a, 0x79, 0x21, 0x59, 0xa7, 0x5a, 0x93, 0xb0, 0xe0, 0x89, 0x2a, 0xf5, 0x01, 0x34, + 0xe4, 0x33, 0xb9, 0x0f, 0x9a, 0x8d, 0x81, 0x1b, 0x8b, 0xb6, 0x87, 0xcc, 0x64, 0x98, 0x95, 0xb9, + 0x5a, 0xe0, 0x83, 0x14, 0x96, 0x47, 0x51, 0x2d, 0x8d, 0xa2, 0xfe, 0x49, 0x85, 0xf5, 0x01, 0x32, + 0xe6, 0x7a, 0x4e, 0x58, 0xea, 0xc3, 0xf3, 0xd2, 0x00, 0x75, 0x4a, 0xae, 0xae, 0x22, 0x54, 0x4c, + 0xd0, 0xec, 0x52, 0x56, 0x2b, 0x96, 0xb2, 0x06, 0xb5, 0x7c, 0x93, 0x2e, 0xf5, 0xd3, 0x47, 0xb2, + 0x0e, 0xf3, 0xb1, 0x39, 0x8a, 0xf2, 0x05, 0x29, 0x0e, 0xfa, 0xc5, 0xcd, 0x66, 0x66, 0x1b, 0x36, + 0x25, 0xfc, 0x05, 0x7f, 0xe9, 0xa2, 0x5c, 0x4d, 0x21, 0x3b, 0xd0, 0x2e, 0x0d, 0x54, 0x5a, 0x46, + 0x1e, 0x55, 0x8f, 0x1e, 0x7d, 0xbf, 0xde, 0x55, 0x7e, 0x5c, 0xef, 0x2a, 0x3f, 0xaf, 0x77, 0x95, + 0x77, 0xba, 0xf8, 0xc7, 0x0c, 0x87, 0x97, 0x3d, 0xfe, 0xd8, 0x73, 0x68, 0x6f, 0xf2, 0xdd, 0xe4, + 0x8d, 0xb0, 0x16, 0xf8, 0x67, 0xef, 0xf0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x35, 0xbb, + 0x56, 0x53, 0x07, 0x00, 0x00, } func (m *StoreEncryptedEntry) Marshal() (dAtA []byte, err error) { diff --git a/go/internal/handshake/crypto_module.go b/go/internal/handshake/crypto_module.go index 5bf1668c11..ea62cd7251 100644 --- a/go/internal/handshake/crypto_module.go +++ b/go/internal/handshake/crypto_module.go @@ -3,8 +3,8 @@ package handshake import ( "crypto/rand" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" "golang.org/x/crypto/nacl/box" ) diff --git a/go/internal/handshake/crypto_session.go b/go/internal/handshake/crypto_session.go index c09c0819ad..cfcc061f17 100644 --- a/go/internal/handshake/crypto_session.go +++ b/go/internal/handshake/crypto_session.go @@ -3,8 +3,8 @@ package handshake import ( "encoding/binary" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" "golang.org/x/crypto/nacl/box" ) diff --git a/go/internal/handshake/crypto_test.go b/go/internal/handshake/crypto_test.go index 7890c6266b..42b5b5fd3e 100644 --- a/go/internal/handshake/crypto_test.go +++ b/go/internal/handshake/crypto_test.go @@ -5,8 +5,8 @@ import ( "crypto/rand" "testing" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/handshake/handshake.pb.go b/go/internal/handshake/handshake.pb.go index 629d756cc6..7b4df7a7ba 100644 --- a/go/internal/handshake/handshake.pb.go +++ b/go/internal/handshake/handshake.pb.go @@ -9,7 +9,7 @@ import ( math "math" math_bits "math/bits" - crypto "berty.tech/go/internal/crypto" + crypto "berty.tech/berty/go/internal/crypto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" ) @@ -214,36 +214,36 @@ func init() { func init() { proto.RegisterFile("go-internal/handshake.proto", fileDescriptor_7dc780342ca42053) } var fileDescriptor_7dc780342ca42053 = []byte{ - // 453 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x86, 0xc9, 0x36, 0x01, 0x3d, 0xeb, 0x46, 0x64, 0x06, 0xaa, 0xca, 0x94, 0x95, 0xc2, 0xc4, - 0x84, 0xb4, 0x44, 0x74, 0x70, 0x81, 0xb8, 0xea, 0x1a, 0x8f, 0x45, 0x85, 0xa4, 0x4a, 0x02, 0x68, - 0xdc, 0x44, 0x6e, 0x6a, 0x1c, 0x8b, 0x2d, 0xae, 0x12, 0x17, 0xa9, 0x4f, 0xc3, 0xeb, 0x70, 0xc9, - 0x23, 0xa0, 0x4a, 0x88, 0xd7, 0x40, 0x75, 0x42, 0xb2, 0xae, 0x12, 0x77, 0xf1, 0xf7, 0x7f, 0x39, - 0xc7, 0xf2, 0x39, 0xf0, 0x88, 0x89, 0x63, 0x9e, 0x4a, 0x9a, 0xa5, 0xe4, 0xd2, 0x4a, 0x48, 0x3a, - 0xc9, 0x13, 0xf2, 0x95, 0x9a, 0xd3, 0x4c, 0x48, 0x81, 0x1a, 0x15, 0x68, 0xb7, 0xaf, 0x7b, 0x39, - 0x67, 0x71, 0x42, 0x78, 0x5a, 0x68, 0xed, 0x63, 0xc6, 0x65, 0x32, 0x1b, 0x9b, 0xb1, 0xb8, 0xb2, - 0x98, 0x60, 0xc2, 0x52, 0x78, 0x3c, 0xfb, 0xa2, 0x4e, 0xea, 0xa0, 0xbe, 0x0a, 0xbd, 0xfb, 0x7b, - 0x13, 0x76, 0xcf, 0xff, 0x15, 0x3e, 0xcb, 0xc8, 0x15, 0x45, 0x6f, 0x60, 0x2b, 0x97, 0x74, 0xda, - 0xd2, 0x3a, 0xda, 0xd1, 0x6e, 0xef, 0x99, 0x59, 0x5f, 0x64, 0x55, 0xac, 0x8f, 0x81, 0xa4, 0x53, - 0x5f, 0xfd, 0x84, 0xba, 0xd0, 0xcc, 0x39, 0x4b, 0x89, 0x9c, 0x65, 0x74, 0x48, 0xe7, 0xad, 0x8d, - 0x8e, 0x76, 0xd4, 0xf4, 0x57, 0x18, 0x7a, 0x0a, 0x3b, 0x34, 0x8d, 0xb3, 0xf9, 0x54, 0x72, 0x91, - 0x2e, 0xa5, 0x4d, 0x25, 0xad, 0x42, 0xf4, 0x1c, 0xf4, 0x12, 0xd0, 0xc9, 0x88, 0xcc, 0x2f, 0x05, - 0x99, 0xb4, 0xb6, 0x94, 0xb8, 0xc6, 0xbb, 0xdf, 0x37, 0x60, 0x67, 0xe5, 0x36, 0xa8, 0x05, 0x7b, - 0x41, 0x88, 0x47, 0xd1, 0x8b, 0x68, 0x88, 0x2f, 0xa2, 0xfe, 0x5b, 0x1f, 0xe3, 0xf7, 0xd8, 0x0d, - 0xf5, 0x5b, 0x55, 0xd2, 0xbb, 0x91, 0x68, 0xe8, 0x3e, 0xdc, 0x53, 0xc9, 0x49, 0x64, 0x3b, 0xc1, - 0xa8, 0x1f, 0x0e, 0xce, 0x75, 0x40, 0x1d, 0xd8, 0x2f, 0x60, 0x3f, 0x1a, 0xba, 0xde, 0x27, 0x37, - 0x72, 0x6c, 0xec, 0x86, 0x4e, 0x78, 0x11, 0x8d, 0x7c, 0xcf, 0x3b, 0xd3, 0xf7, 0xd0, 0x21, 0x3c, - 0x56, 0xc6, 0xcb, 0x35, 0xc3, 0x76, 0x82, 0xc1, 0x3b, 0x2f, 0xf8, 0xe0, 0x63, 0xfd, 0x41, 0xa5, - 0xbd, 0xfa, 0x9f, 0xf6, 0x10, 0x19, 0xd0, 0x2e, 0xfa, 0x9d, 0x96, 0x9a, 0x8d, 0x3f, 0x3a, 0x03, - 0x5c, 0x76, 0x33, 0xd0, 0x13, 0x38, 0x28, 0xba, 0xdd, 0xc8, 0xaf, 0x15, 0x39, 0x40, 0x3a, 0x6c, - 0x2b, 0xe9, 0x75, 0x64, 0x7b, 0x2e, 0xd6, 0xff, 0xdc, 0xe9, 0xce, 0x40, 0xaf, 0x1e, 0xa8, 0x7c, - 0x35, 0xb4, 0x0f, 0x8d, 0x6a, 0x2e, 0x6a, 0xda, 0x4d, 0xbf, 0x06, 0xe8, 0x10, 0xee, 0xe6, 0x9c, - 0x0d, 0x96, 0xab, 0xa5, 0xa6, 0xb8, 0xdd, 0x6b, 0x98, 0x41, 0x09, 0xfc, 0x2a, 0x5a, 0x16, 0x99, - 0xd0, 0x6f, 0x3c, 0xa6, 0xf5, 0x20, 0x6b, 0x70, 0x6a, 0xfe, 0x58, 0x18, 0xda, 0xcf, 0x85, 0xa1, - 0xfd, 0x5a, 0x18, 0xda, 0xe7, 0xce, 0x98, 0x66, 0x72, 0x6e, 0x4a, 0x1a, 0x27, 0x16, 0x13, 0xd6, - 0xfa, 0xaa, 0x8f, 0x6f, 0xab, 0xad, 0x3c, 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x9a, 0x61, - 0x6f, 0x0a, 0x03, 0x00, 0x00, + // 456 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x51, 0x6f, 0xd3, 0x30, + 0x10, 0x80, 0xc9, 0x36, 0x01, 0xbd, 0x75, 0x23, 0x32, 0x03, 0x55, 0x65, 0xca, 0x4a, 0x61, 0x30, + 0x21, 0x2d, 0x11, 0xdd, 0x78, 0x40, 0x3c, 0x75, 0x8d, 0xc7, 0xa2, 0x42, 0x52, 0x25, 0x01, 0x34, + 0x5e, 0xa2, 0x34, 0x35, 0x8e, 0xc5, 0x16, 0x57, 0x89, 0x8b, 0xd4, 0x5f, 0xc3, 0xdf, 0xe1, 0x91, + 0x9f, 0x80, 0x2a, 0x21, 0xfe, 0x06, 0xaa, 0x13, 0x92, 0xa5, 0x95, 0x78, 0xf3, 0x7d, 0xf7, 0xf9, + 0xce, 0xf2, 0x1d, 0x3c, 0xa2, 0xfc, 0x98, 0x25, 0x82, 0xa4, 0x49, 0x78, 0x65, 0xc4, 0x61, 0x32, + 0xc9, 0xe2, 0xf0, 0x2b, 0xd1, 0xa7, 0x29, 0x17, 0x1c, 0x35, 0x4a, 0xd0, 0x6e, 0xdf, 0xf4, 0x32, + 0x46, 0xa3, 0x38, 0x64, 0x49, 0xae, 0xb5, 0x8f, 0x29, 0x13, 0xf1, 0x6c, 0xac, 0x47, 0xfc, 0xda, + 0xa0, 0x9c, 0x72, 0x43, 0xe2, 0xf1, 0xec, 0x8b, 0x8c, 0x64, 0x20, 0x4f, 0xb9, 0xde, 0xfd, 0xbd, + 0x09, 0xbb, 0x17, 0xff, 0x0a, 0x9f, 0xa7, 0xe1, 0x35, 0x41, 0x6f, 0x60, 0x2b, 0x13, 0x64, 0xda, + 0x52, 0x3a, 0xca, 0xd1, 0x6e, 0xef, 0xb9, 0x5e, 0x3d, 0xa4, 0x2e, 0x56, 0xa1, 0x27, 0xc8, 0xd4, + 0x95, 0x97, 0x50, 0x17, 0x9a, 0x19, 0xa3, 0x49, 0x28, 0x66, 0x29, 0x19, 0x92, 0x79, 0x6b, 0xa3, + 0xa3, 0x1c, 0x35, 0xdd, 0x1a, 0x43, 0x4f, 0x61, 0x87, 0x24, 0x51, 0x3a, 0x9f, 0x0a, 0xc6, 0x93, + 0xa5, 0xb4, 0x29, 0xa5, 0x3a, 0x44, 0x2f, 0x40, 0x2d, 0x00, 0x99, 0x8c, 0xc2, 0xf9, 0x15, 0x0f, + 0x27, 0xad, 0x2d, 0x29, 0xae, 0xf1, 0xee, 0xf7, 0x0d, 0xd8, 0xa9, 0xbd, 0x06, 0xb5, 0x60, 0xcf, + 0xf3, 0xf1, 0x28, 0x78, 0x19, 0x0c, 0xf1, 0x65, 0xd0, 0x7f, 0xeb, 0x62, 0xfc, 0x1e, 0xdb, 0xbe, + 0x7a, 0xab, 0xcc, 0xf4, 0x56, 0x32, 0x0a, 0xba, 0x0f, 0xf7, 0x64, 0xe6, 0x24, 0x30, 0x2d, 0x6f, + 0xd4, 0xf7, 0x07, 0x17, 0x2a, 0xa0, 0x0e, 0xec, 0xe7, 0xb0, 0x1f, 0x0c, 0x6d, 0xe7, 0x93, 0x1d, + 0x58, 0x26, 0xb6, 0x7d, 0xcb, 0xbf, 0x0c, 0x46, 0xae, 0xe3, 0x9c, 0xab, 0x7b, 0xe8, 0x10, 0x1e, + 0x4b, 0xe3, 0x74, 0xcd, 0x30, 0x2d, 0x6f, 0xf0, 0xce, 0xf1, 0x3e, 0xb8, 0x58, 0x7d, 0x50, 0x6a, + 0xaf, 0xfe, 0xa7, 0x3d, 0x44, 0x1a, 0xb4, 0xf3, 0x7e, 0x67, 0x85, 0x66, 0xe2, 0x8f, 0xd6, 0x00, + 0x17, 0xdd, 0x34, 0xf4, 0x04, 0x0e, 0xf2, 0x6e, 0x2b, 0xf9, 0x1b, 0x45, 0x0e, 0x90, 0x0a, 0xdb, + 0x52, 0x7a, 0x1d, 0x98, 0x8e, 0x8d, 0xd5, 0x3f, 0x77, 0xba, 0x33, 0x50, 0xcb, 0x0f, 0x2a, 0x7e, + 0x0d, 0xed, 0x43, 0xa3, 0x9c, 0x8b, 0x9c, 0x76, 0xd3, 0xad, 0x00, 0x3a, 0x84, 0xbb, 0x19, 0xa3, + 0x83, 0xe5, 0x6a, 0xc9, 0x29, 0x6e, 0xf7, 0x1a, 0xba, 0x57, 0x00, 0xb7, 0x4c, 0x2d, 0x8b, 0x4c, + 0xc8, 0x37, 0x16, 0x91, 0x6a, 0x90, 0x15, 0x38, 0x3b, 0xfd, 0xb1, 0xd0, 0x94, 0x9f, 0x0b, 0x4d, + 0xf9, 0xb5, 0xd0, 0x94, 0xcf, 0xcf, 0xc6, 0x24, 0x15, 0x73, 0x5d, 0x90, 0x28, 0x36, 0xe4, 0xd1, + 0xa0, 0xdc, 0x58, 0x5f, 0xf8, 0xf1, 0x6d, 0xb9, 0x9b, 0x27, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x98, 0x1e, 0x5f, 0x17, 0x10, 0x03, 0x00, 0x00, } func (m *HandshakeFrame) Marshal() (dAtA []byte, err error) { diff --git a/go/internal/handshake/net_flow.go b/go/internal/handshake/net_flow.go index e451a88d62..434157d757 100644 --- a/go/internal/handshake/net_flow.go +++ b/go/internal/handshake/net_flow.go @@ -4,8 +4,8 @@ import ( "context" "net" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" ggio "github.com/gogo/protobuf/io" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" inet "github.com/libp2p/go-libp2p-core/network" diff --git a/go/internal/handshake/net_flow_test.go b/go/internal/handshake/net_flow_test.go index 5b896dfb75..e62a51f297 100644 --- a/go/internal/handshake/net_flow_test.go +++ b/go/internal/handshake/net_flow_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" ggio "github.com/gogo/protobuf/io" "github.com/gogo/protobuf/proto" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" diff --git a/go/internal/handshake/net_step_1_2_key_agreement.go b/go/internal/handshake/net_step_1_2_key_agreement.go index 06462d20cc..b3fb57c68a 100644 --- a/go/internal/handshake/net_step_1_2_key_agreement.go +++ b/go/internal/handshake/net_step_1_2_key_agreement.go @@ -3,7 +3,7 @@ package handshake import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/handshake/net_step_3_auth_challenge.go b/go/internal/handshake/net_step_3_auth_challenge.go index 6a2f374744..ce94b19d03 100644 --- a/go/internal/handshake/net_step_3_auth_challenge.go +++ b/go/internal/handshake/net_step_3_auth_challenge.go @@ -3,7 +3,7 @@ package handshake import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) type step3ProveOtherKey struct { diff --git a/go/internal/handshake/net_step_4_5_sigchain_exchange.go b/go/internal/handshake/net_step_4_5_sigchain_exchange.go index cbd4bbfeb7..afe041588f 100644 --- a/go/internal/handshake/net_step_4_5_sigchain_exchange.go +++ b/go/internal/handshake/net_step_4_5_sigchain_exchange.go @@ -3,8 +3,8 @@ package handshake import ( "context" - "berty.tech/go/internal/crypto" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/crypto" + "berty.tech/berty/go/pkg/errcode" p2pcrypto "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/handshake/net_utils.go b/go/internal/handshake/net_utils.go index 3527e64d0c..0ee74cf352 100644 --- a/go/internal/handshake/net_utils.go +++ b/go/internal/handshake/net_utils.go @@ -1,7 +1,7 @@ package handshake import ( - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ggio "github.com/gogo/protobuf/io" ) diff --git a/go/internal/ipfsutil/api_configurable.go b/go/internal/ipfsutil/api_configurable.go index 2a7bc3b8b0..dbc14be91e 100644 --- a/go/internal/ipfsutil/api_configurable.go +++ b/go/internal/ipfsutil/api_configurable.go @@ -3,7 +3,7 @@ package ipfsutil import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ipfs_core "github.com/ipfs/go-ipfs/core" ipfs_coreapi "github.com/ipfs/go-ipfs/core/coreapi" ipfs_node "github.com/ipfs/go-ipfs/core/node" diff --git a/go/internal/ipfsutil/api_inmemory.go b/go/internal/ipfsutil/api_inmemory.go index 5523fb3ce0..f20083d812 100644 --- a/go/internal/ipfsutil/api_inmemory.go +++ b/go/internal/ipfsutil/api_inmemory.go @@ -5,7 +5,7 @@ import ( "crypto/rand" "encoding/base64" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ipfs_datastore "github.com/ipfs/go-datastore" ipfs_datastoresync "github.com/ipfs/go-datastore/sync" ipfs_cfg "github.com/ipfs/go-ipfs-config" diff --git a/go/internal/ipfsutil/mdns_discovery.go b/go/internal/ipfsutil/mdns_discovery.go index 50dbefa773..6cff8ebcfc 100644 --- a/go/internal/ipfsutil/mdns_discovery.go +++ b/go/internal/ipfsutil/mdns_discovery.go @@ -4,7 +4,7 @@ import ( "context" "time" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p/p2p/discovery" ipfs_core "github.com/ipfs/go-ipfs/core" diff --git a/go/internal/orbitutil/doc.go b/go/internal/orbitutil/doc.go index 95bd2e46ff..f7130e245c 100644 --- a/go/internal/orbitutil/doc.go +++ b/go/internal/orbitutil/doc.go @@ -1,2 +1,2 @@ -// orbitutil contains access controllers and stores for the Berty protocol -package orbitutil // import "berty.tech/go/internal/orbitutil" +// Package orbitutil contains access controllers and stores for the Berty protocol +package orbitutil // import "berty.tech/berty/go/internal/orbitutil" diff --git a/go/internal/orbitutil/group_context.go b/go/internal/orbitutil/group_context.go index 3f2b3e11ef..61190b8efb 100644 --- a/go/internal/orbitutil/group_context.go +++ b/go/internal/orbitutil/group_context.go @@ -3,9 +3,9 @@ package orbitutil import ( "sync" - "berty.tech/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/group" + "berty.tech/berty/go/internal/group" ) type GroupContext struct { diff --git a/go/internal/orbitutil/identityberty/signed_entry_identity_provider.go b/go/internal/orbitutil/identityberty/signed_entry_identity_provider.go index 523395de39..153e3e141a 100644 --- a/go/internal/orbitutil/identityberty/signed_entry_identity_provider.go +++ b/go/internal/orbitutil/identityberty/signed_entry_identity_provider.go @@ -1,8 +1,8 @@ package identityberty import ( + "berty.tech/berty/go/pkg/errcode" "berty.tech/go-ipfs-log/identityprovider" - "berty.tech/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/orbitutil/identityberty/signed_entry_keystore.go b/go/internal/orbitutil/identityberty/signed_entry_keystore.go index 912cb9660b..eb1c4fe725 100644 --- a/go/internal/orbitutil/identityberty/signed_entry_keystore.go +++ b/go/internal/orbitutil/identityberty/signed_entry_keystore.go @@ -6,7 +6,7 @@ import ( "berty.tech/go-ipfs-log/keystore" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/orbitutil/orbitdb.go b/go/internal/orbitutil/orbitdb.go index 449be94c73..2aac607304 100644 --- a/go/internal/orbitutil/orbitdb.go +++ b/go/internal/orbitutil/orbitdb.go @@ -6,6 +6,13 @@ import ( "sync" "time" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/identityberty" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/storegroup" + memberstore "berty.tech/berty/go/internal/orbitutil/storemember" + settingstore "berty.tech/berty/go/internal/orbitutil/storesetting" + "berty.tech/berty/go/pkg/errcode" "berty.tech/go-ipfs-log/identityprovider" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/accesscontroller/simple" @@ -14,13 +21,6 @@ import ( "berty.tech/go-orbit-db/events" "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/stores" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/identityberty" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/orbitutil/storegroup" - memberstore "berty.tech/go/internal/orbitutil/storemember" - settingstore "berty.tech/go/internal/orbitutil/storesetting" - "berty.tech/go/pkg/errcode" coreapi "github.com/ipfs/interface-go-ipfs-core" "github.com/libp2p/go-libp2p-core/crypto" "github.com/pkg/errors" diff --git a/go/internal/orbitutil/orbittestutil/orbittestutil.go b/go/internal/orbitutil/orbittestutil/orbittestutil.go index ce2e2cadbf..c2a9e4f5a6 100644 --- a/go/internal/orbitutil/orbittestutil/orbittestutil.go +++ b/go/internal/orbitutil/orbittestutil/orbittestutil.go @@ -7,10 +7,10 @@ import ( "path" "testing" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/orbitutil" orbitdb "berty.tech/go-orbit-db" - "berty.tech/go/internal/group" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/orbitutil" "github.com/libp2p/go-libp2p-core/crypto" peer "github.com/libp2p/go-libp2p-core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" diff --git a/go/internal/orbitutil/orbitutilapi/api.go b/go/internal/orbitutil/orbitutilapi/api.go index 089a41663a..f7df1248a5 100644 --- a/go/internal/orbitutil/orbitutilapi/api.go +++ b/go/internal/orbitutil/orbitutilapi/api.go @@ -3,12 +3,12 @@ package orbitutilapi import ( "context" + "berty.tech/berty/go/internal/group" "berty.tech/go-ipfs-log/identityprovider" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/address" "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/go/internal/group" coreapi "github.com/ipfs/interface-go-ipfs-core" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/orbitutil/storegroup/default_store_opts.go b/go/internal/orbitutil/storegroup/default_store_opts.go index 9eca182336..29ce764b58 100644 --- a/go/internal/orbitutil/storegroup/default_store_opts.go +++ b/go/internal/orbitutil/storegroup/default_store_opts.go @@ -3,12 +3,12 @@ package storegroup import ( "encoding/hex" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/identityberty" + "berty.tech/berty/go/pkg/errcode" "berty.tech/go-ipfs-log/identityprovider" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/accesscontroller" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/identityberty" - "berty.tech/go/pkg/errcode" ) func DefaultOptions(g *group.Group, options *orbitdb.CreateDBOptions, keystore *identityberty.BertySignedKeyStore) (*orbitdb.CreateDBOptions, error) { diff --git a/go/internal/orbitutil/storegroup/store.go b/go/internal/orbitutil/storegroup/store.go index 7c00a00e49..e5196161d6 100644 --- a/go/internal/orbitutil/storegroup/store.go +++ b/go/internal/orbitutil/storegroup/store.go @@ -3,11 +3,11 @@ package storegroup import ( "sync" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/pkg/errcode" ipfslog "berty.tech/go-ipfs-log" "berty.tech/go-orbit-db/stores/basestore" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/pkg/errcode" ) type BaseGroupStore struct { diff --git a/go/internal/orbitutil/storemember/member_store.go b/go/internal/orbitutil/storemember/member_store.go index 3c4391b303..a1d2e3fc75 100644 --- a/go/internal/orbitutil/storemember/member_store.go +++ b/go/internal/orbitutil/storemember/member_store.go @@ -3,14 +3,14 @@ package storemember import ( "context" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/storegroup" + "berty.tech/berty/go/pkg/errcode" "berty.tech/go-ipfs-log/identityprovider" "berty.tech/go-orbit-db/address" "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/orbitutil/storegroup" - "berty.tech/go/pkg/errcode" coreapi "github.com/ipfs/interface-go-ipfs-core" "github.com/libp2p/go-libp2p-core/crypto" "github.com/pkg/errors" diff --git a/go/internal/orbitutil/storemember/member_store_index.go b/go/internal/orbitutil/storemember/member_store_index.go index 00f9719911..23995d424e 100644 --- a/go/internal/orbitutil/storemember/member_store_index.go +++ b/go/internal/orbitutil/storemember/member_store_index.go @@ -3,12 +3,12 @@ package storemember import ( "sync" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/storegroup" + "berty.tech/berty/go/pkg/errcode" ipfslog "berty.tech/go-ipfs-log" "berty.tech/go-orbit-db/iface" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/orbitutil/storegroup" - "berty.tech/go/pkg/errcode" "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/go/internal/orbitutil/storemember/member_store_test.go b/go/internal/orbitutil/storemember/member_store_test.go index 9138f082bd..aba23093c9 100644 --- a/go/internal/orbitutil/storemember/member_store_test.go +++ b/go/internal/orbitutil/storemember/member_store_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/orbitutil" + "berty.tech/berty/go/internal/orbitutil/orbittestutil" + "berty.tech/berty/go/internal/testutil" orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/events" "berty.tech/go-orbit-db/stores" - "berty.tech/go/internal/group" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/orbitutil" - "berty.tech/go/internal/orbitutil/orbittestutil" - "berty.tech/go/internal/testutil" peer "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/go/internal/orbitutil/storesetting/settings_store.go b/go/internal/orbitutil/storesetting/settings_store.go index 52cfff7ec3..0fbe4d97ef 100644 --- a/go/internal/orbitutil/storesetting/settings_store.go +++ b/go/internal/orbitutil/storesetting/settings_store.go @@ -5,14 +5,14 @@ import ( "encoding/base64" "fmt" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/storegroup" + "berty.tech/berty/go/pkg/errcode" "berty.tech/go-ipfs-log/identityprovider" "berty.tech/go-orbit-db/address" "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/stores/operation" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/orbitutil/storegroup" - "berty.tech/go/pkg/errcode" coreapi "github.com/ipfs/interface-go-ipfs-core" "github.com/libp2p/go-libp2p-core/crypto" "github.com/pkg/errors" diff --git a/go/internal/orbitutil/storesetting/settings_store_index.go b/go/internal/orbitutil/storesetting/settings_store_index.go index 313d6f9a40..c7d240f0dc 100644 --- a/go/internal/orbitutil/storesetting/settings_store_index.go +++ b/go/internal/orbitutil/storesetting/settings_store_index.go @@ -3,11 +3,11 @@ package settingstore import ( "sync" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/orbitutil/storegroup" ipfslog "berty.tech/go-ipfs-log" "berty.tech/go-orbit-db/iface" - "berty.tech/go/internal/group" - "berty.tech/go/internal/orbitutil/orbitutilapi" - "berty.tech/go/internal/orbitutil/storegroup" ) type settingsIndex struct { diff --git a/go/internal/orbitutil/storesetting/settings_store_test.go b/go/internal/orbitutil/storesetting/settings_store_test.go index f97a20155d..b35286454f 100644 --- a/go/internal/orbitutil/storesetting/settings_store_test.go +++ b/go/internal/orbitutil/storesetting/settings_store_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "berty.tech/go/internal/group" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/orbitutil" - "berty.tech/go/internal/orbitutil/orbittestutil" - "berty.tech/go/internal/orbitutil/orbitutilapi" + "berty.tech/berty/go/internal/group" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/orbitutil" + "berty.tech/berty/go/internal/orbitutil/orbittestutil" + "berty.tech/berty/go/internal/orbitutil/orbitutilapi" peer "github.com/libp2p/go-libp2p-core/peer" ) @@ -58,7 +58,9 @@ func (m *TestContext) GetMemberDevices() *orbittestutil.MemberDevices { var _ orbittestutil.MockedPeer = (*TestContext)(nil) var _ orbitutilapi.GroupContext = (*TestContext)(nil) -func setUpStores(t *testing.T, ctx context.Context, members int, pathBase string) []*TestContext { +func setUpStores(ctx context.Context, t *testing.T, members int, pathBase string) []*TestContext { + t.Helper() + testContexts := make([]*TestContext, members) peers := make([]orbittestutil.MockedPeer, members) for i := 0; i < members; i++ { @@ -103,7 +105,7 @@ func TestSettingsStore(t *testing.T) { pathBase := "./orbitdb-test/tests/settings-store-test/" defer os.RemoveAll("./orbitdb-test/") - contexts := setUpStores(t, ctx, 2, pathBase) + contexts := setUpStores(ctx, t, 2, pathBase) // Get empty store diff --git a/go/internal/protocoldb/datastore.go b/go/internal/protocoldb/datastore.go index 7c3bc8f127..beaa559c75 100644 --- a/go/internal/protocoldb/datastore.go +++ b/go/internal/protocoldb/datastore.go @@ -1,8 +1,8 @@ package protocoldb import ( - "berty.tech/go/internal/gormutil" - "berty.tech/go/internal/protocoldb/migrations" + "berty.tech/berty/go/internal/gormutil" + "berty.tech/berty/go/internal/protocoldb/migrations" "github.com/jinzhu/gorm" "go.uber.org/zap" ) diff --git a/go/internal/protocoldb/datastore_test.go b/go/internal/protocoldb/datastore_test.go index de4f5ca346..19bab44b89 100644 --- a/go/internal/protocoldb/datastore_test.go +++ b/go/internal/protocoldb/datastore_test.go @@ -3,9 +3,9 @@ package protocoldb import ( "testing" - "berty.tech/go/internal/gormutil" - "berty.tech/go/internal/protocoldb/migrations" - "berty.tech/go/internal/testutil" + "berty.tech/berty/go/internal/gormutil" + "berty.tech/berty/go/internal/protocoldb/migrations" + "berty.tech/berty/go/internal/testutil" ) func TestDropDatabase(t *testing.T) { diff --git a/go/internal/protocoldb/doc.go b/go/internal/protocoldb/doc.go index 3117f70b7d..e07f085f69 100644 --- a/go/internal/protocoldb/doc.go +++ b/go/internal/protocoldb/doc.go @@ -1 +1 @@ -package protocoldb // import "berty.tech/go/internal/protocoldb" +package protocoldb // import "berty.tech/berty/go/internal/protocoldb" diff --git a/go/internal/protocoldb/migrations/doc.go b/go/internal/protocoldb/migrations/doc.go index 12add5bd99..ff4d31aeec 100644 --- a/go/internal/protocoldb/migrations/doc.go +++ b/go/internal/protocoldb/migrations/doc.go @@ -1 +1 @@ -package migrations // import "berty.tech/go/internal/protocoldb/migrations" +package migrations // import "berty.tech/berty/go/internal/protocoldb/migrations" diff --git a/go/internal/protocoldb/migrations/migrations.go b/go/internal/protocoldb/migrations/migrations.go index 733cb1fb46..d6c3d6d9ad 100644 --- a/go/internal/protocoldb/migrations/migrations.go +++ b/go/internal/protocoldb/migrations/migrations.go @@ -1,8 +1,8 @@ package migrations import ( - "berty.tech/go/internal/protocoldb/migrations/v0001init" - "gopkg.in/gormigrate.v1" + "berty.tech/berty/go/internal/protocoldb/migrations/v0001init" + gormigrate "gopkg.in/gormigrate.v1" ) // GetMigrations returns a list of migrations for protocol database diff --git a/go/internal/protocoldb/protocolmodel.pb.go b/go/internal/protocoldb/protocolmodel.pb.go index 9136293cb5..dbc03f3e78 100644 --- a/go/internal/protocoldb/protocolmodel.pb.go +++ b/go/internal/protocoldb/protocolmodel.pb.go @@ -997,112 +997,113 @@ func init() { func init() { proto.RegisterFile("go-internal/protocolmodel.proto", fileDescriptor_e2f5bc4155f6089b) } var fileDescriptor_e2f5bc4155f6089b = []byte{ - // 1711 bytes of a gzipped FileDescriptorProto + // 1714 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdd, 0x6e, 0x1b, 0xb9, - 0x15, 0xb6, 0xe2, 0x1f, 0x49, 0x47, 0x92, 0x2d, 0xd3, 0xde, 0xcd, 0xd4, 0x49, 0x23, 0xaf, 0xb6, - 0x4d, 0xdd, 0x45, 0x2d, 0x61, 0x93, 0x06, 0x29, 0x9c, 0xa0, 0x0b, 0xcb, 0x09, 0xd2, 0x60, 0x37, + 0x15, 0xb6, 0xe2, 0x1f, 0x49, 0x47, 0x92, 0x2d, 0xd3, 0xde, 0xcd, 0xd4, 0x49, 0x23, 0x57, 0xdb, + 0x66, 0xdd, 0x45, 0x2d, 0x61, 0x93, 0x06, 0x29, 0x9c, 0xa0, 0x0b, 0xcb, 0x09, 0xd2, 0x60, 0x37, 0xb5, 0x77, 0xe4, 0x2c, 0x8a, 0xf4, 0x62, 0x30, 0x9a, 0x39, 0x1a, 0x13, 0x19, 0x91, 0xea, 0x0c, 0xc7, 0x8d, 0x72, 0x53, 0xb4, 0x4f, 0xb0, 0x2f, 0xd0, 0xbb, 0xde, 0xf7, 0x2d, 0x8a, 0x5e, 0x15, 0x05, 0x7a, 0xd3, 0x2b, 0x15, 0x48, 0x5e, 0xa0, 0xf0, 0x13, 0x14, 0x43, 0x72, 0xa4, 0x19, 0xfd, - 0x39, 0x3f, 0x28, 0xe0, 0x2b, 0x89, 0x3c, 0xdf, 0x39, 0xe4, 0x90, 0xdf, 0xf9, 0x78, 0x48, 0xa8, + 0x39, 0x3f, 0x28, 0xe0, 0x2b, 0x0d, 0x79, 0xbe, 0x73, 0x48, 0x91, 0xdf, 0xf9, 0x78, 0x48, 0xa8, 0x79, 0x7c, 0x9f, 0x32, 0x81, 0x01, 0xb3, 0xfd, 0x66, 0x3f, 0xe0, 0x82, 0x3b, 0xdc, 0xef, 0x71, 0x17, 0xfd, 0x86, 0x6c, 0x91, 0xad, 0x0e, 0x06, 0x62, 0xd0, 0xc8, 0x98, 0x76, 0x1e, 0x78, 0x54, 0x9c, 0x45, 0x9d, 0x86, 0xc3, 0x7b, 0x4d, 0x8f, 0xfb, 0x36, 0xf3, 0x94, 0x6f, 0x27, 0xea, 0x36, - 0xfb, 0x62, 0xd0, 0xc7, 0xb0, 0x29, 0x68, 0x0f, 0x43, 0x61, 0xf7, 0xfa, 0xe3, 0x7f, 0x2a, 0xc8, - 0xce, 0x7e, 0xc6, 0xd9, 0xe3, 0x63, 0xd7, 0xb8, 0x25, 0x1b, 0xf2, 0x9f, 0x82, 0xd7, 0xff, 0x5b, - 0x84, 0xe2, 0x93, 0x80, 0x47, 0xfd, 0xa7, 0xac, 0xcb, 0xc9, 0x01, 0x54, 0xbc, 0xb8, 0x61, 0xf5, - 0xa3, 0x8e, 0xf5, 0x12, 0x07, 0x46, 0x6e, 0x37, 0xb7, 0x57, 0x6e, 0x7d, 0x7a, 0x31, 0xac, 0x11, - 0x8f, 0x07, 0xbd, 0x83, 0x7a, 0x3f, 0xa0, 0x3d, 0x3b, 0x18, 0xc4, 0xc6, 0xba, 0x59, 0x92, 0xe0, - 0x93, 0xa8, 0xf3, 0x35, 0x0e, 0xc8, 0x17, 0xb0, 0xa9, 0x7c, 0x43, 0xea, 0x31, 0xca, 0x3c, 0xe9, - 0x7f, 0x2d, 0xf6, 0x37, 0x37, 0xa4, 0xa1, 0xad, 0xfa, 0x63, 0xec, 0x0e, 0x14, 0x7a, 0x28, 0x6c, - 0xd7, 0x16, 0xb6, 0xb1, 0x2c, 0x21, 0xa3, 0x36, 0x79, 0x01, 0x05, 0x3b, 0x72, 0x29, 0x32, 0x07, - 0x8d, 0x95, 0xdd, 0xdc, 0xde, 0xfa, 0x9d, 0x9f, 0x35, 0x66, 0xac, 0x52, 0x63, 0x34, 0x6b, 0xf5, - 0xef, 0x50, 0xfb, 0xb4, 0xaa, 0x17, 0xc3, 0x5a, 0x59, 0x4d, 0x96, 0x32, 0x17, 0x5f, 0xd5, 0xcd, - 0x51, 0x3c, 0x62, 0x40, 0xfe, 0x1c, 0x83, 0x90, 0x72, 0x66, 0xac, 0xee, 0xe6, 0xf6, 0x2a, 0x66, - 0xd2, 0x24, 0x5f, 0xc2, 0x27, 0x21, 0xfa, 0x5d, 0xab, 0x1f, 0xd0, 0xf3, 0x78, 0xe6, 0x96, 0xed, - 0x38, 0x3c, 0x62, 0xc2, 0x58, 0x93, 0xd3, 0x23, 0xb1, 0xf1, 0x24, 0xa0, 0xe7, 0x5f, 0xe3, 0xe0, - 0x50, 0x59, 0x48, 0x13, 0xb6, 0xb3, 0x2e, 0x2e, 0x9e, 0x53, 0x07, 0x8d, 0xbc, 0xf4, 0xd8, 0x4c, - 0x79, 0x3c, 0x92, 0x86, 0x91, 0x03, 0x65, 0xe7, 0x54, 0x60, 0x30, 0x5a, 0xe4, 0xc2, 0xd8, 0xe1, - 0xa9, 0x32, 0xe9, 0x25, 0xbd, 0x07, 0xd7, 0x13, 0xac, 0xc3, 0x99, 0xb0, 0x1d, 0x31, 0xf2, 0x29, - 0x4a, 0x9f, 0x6d, 0x6d, 0x3e, 0x52, 0x56, 0xed, 0xf6, 0x5b, 0xb8, 0xc1, 0x83, 0x0e, 0x15, 0x6e, - 0xc7, 0x72, 0xa2, 0x20, 0x40, 0x26, 0x2c, 0x87, 0xba, 0x56, 0x0f, 0xc3, 0xd0, 0xf6, 0xd0, 0x00, - 0xb9, 0xa7, 0x37, 0xdf, 0x0c, 0x6b, 0xc6, 0x71, 0x0c, 0x7b, 0xd4, 0x3a, 0x52, 0xa8, 0xa3, 0xa7, - 0x8f, 0x9e, 0x29, 0x8c, 0x69, 0xe8, 0x00, 0x89, 0x85, 0xba, 0xda, 0x42, 0x7e, 0x03, 0x3b, 0xb3, - 0x82, 0x87, 0xe8, 0x04, 0x28, 0x8c, 0x92, 0x8c, 0x7d, 0xe3, 0xcd, 0xb0, 0x76, 0x7d, 0x2a, 0x76, - 0x5b, 0x42, 0xcc, 0xeb, 0x53, 0xa1, 0x95, 0x61, 0xde, 0xb4, 0x43, 0x14, 0x82, 0x32, 0xcf, 0x28, - 0x2f, 0x98, 0x76, 0x5b, 0x61, 0x66, 0x4c, 0x5b, 0x5b, 0xe6, 0x4d, 0xbb, 0x87, 0xbd, 0x0e, 0x06, - 0x46, 0x65, 0xc1, 0xb4, 0x9f, 0x49, 0xc8, 0x8c, 0x69, 0x2b, 0x03, 0xe9, 0x41, 0x5e, 0x45, 0x09, - 0x8d, 0x93, 0xdd, 0xe5, 0xbd, 0xd2, 0x9d, 0xdd, 0xf9, 0x74, 0x55, 0x2e, 0xad, 0x2f, 0x2f, 0x86, - 0xb5, 0x7d, 0x45, 0xd1, 0x2e, 0x0f, 0x90, 0x7a, 0xec, 0x25, 0x0e, 0x0e, 0x32, 0x99, 0xf7, 0xe0, - 0xc4, 0x7c, 0xfc, 0xcd, 0xf1, 0xe1, 0xa3, 0x83, 0xae, 0xed, 0x87, 0x58, 0x37, 0x93, 0x31, 0x48, - 0x08, 0x79, 0xbd, 0xe9, 0xc6, 0xb7, 0xbb, 0xb9, 0xbd, 0xd2, 0x9d, 0x9b, 0x33, 0x87, 0xd3, 0x8c, - 0x68, 0x3d, 0xb8, 0x18, 0xd6, 0xee, 0x4f, 0x0d, 0x35, 0x87, 0x55, 0x53, 0x83, 0x6a, 0x1c, 0x39, - 0x02, 0x70, 0x02, 0xb4, 0x05, 0xba, 0x96, 0x2d, 0x8c, 0x8e, 0x1c, 0x77, 0xa7, 0xe1, 0x71, 0xee, - 0xf9, 0xd8, 0x48, 0x04, 0xa6, 0x71, 0x9a, 0x48, 0x51, 0xab, 0xf0, 0xf7, 0x61, 0x6d, 0xe9, 0xfb, - 0xff, 0xd4, 0x72, 0x66, 0x51, 0xfb, 0x1d, 0x8a, 0x38, 0x48, 0xd4, 0x77, 0x93, 0x20, 0xce, 0xfb, - 0x04, 0xd1, 0x7e, 0x87, 0xa2, 0x7e, 0x08, 0x95, 0x4c, 0xba, 0x93, 0x0a, 0x14, 0x9f, 0x33, 0x17, - 0xbb, 0x94, 0xa1, 0x5b, 0x5d, 0x22, 0x65, 0x28, 0x1c, 0x33, 0x3c, 0xe5, 0xc7, 0x0c, 0xab, 0x39, - 0x52, 0x84, 0x55, 0x89, 0xae, 0x5e, 0x23, 0x05, 0x58, 0x69, 0xa3, 0xdf, 0xad, 0x2e, 0xd7, 0xff, - 0xb2, 0x0a, 0xdb, 0x5a, 0x3c, 0x1c, 0xde, 0x8b, 0x69, 0x83, 0xbf, 0x8b, 0x30, 0x14, 0x1f, 0xa5, - 0x7e, 0x77, 0xe1, 0xd3, 0x64, 0x51, 0xd5, 0x4e, 0x8d, 0x82, 0x28, 0x09, 0xdc, 0xd2, 0x56, 0xc5, - 0x00, 0xed, 0xf4, 0x63, 0x58, 0x97, 0xdd, 0xb6, 0xa0, 0x9c, 0xc5, 0xba, 0xa9, 0xc5, 0xb0, 0x32, - 0xee, 0x6d, 0x53, 0x8f, 0x34, 0x60, 0x2b, 0x05, 0x4b, 0xe4, 0x46, 0x8a, 0x63, 0xd9, 0xdc, 0x1c, - 0x9b, 0xb4, 0xda, 0xcc, 0x56, 0xe2, 0xd5, 0xd9, 0x4a, 0xfc, 0x79, 0xf2, 0xcd, 0x89, 0x2e, 0x2a, - 0xbd, 0x2b, 0xcb, 0xce, 0xef, 0xb4, 0x38, 0xee, 0x03, 0xc1, 0x30, 0x44, 0x26, 0xa8, 0xed, 0x5b, - 0x23, 0xe1, 0xd6, 0x3a, 0x37, 0xb2, 0x3c, 0x4b, 0x14, 0xfc, 0x03, 0x65, 0xeb, 0x4f, 0x39, 0xd8, - 0x98, 0xf0, 0x93, 0xd2, 0xf8, 0x7f, 0xa5, 0xf8, 0x7a, 0x76, 0x2a, 0x57, 0x88, 0xe9, 0x7f, 0xcd, - 0x43, 0x29, 0x25, 0x1a, 0xe4, 0x09, 0x6c, 0xab, 0x9d, 0x9a, 0xe0, 0xd7, 0x62, 0x92, 0x2a, 0x26, - 0x64, 0x58, 0x77, 0x7f, 0x92, 0xe6, 0x92, 0xa1, 0xad, 0xad, 0x8b, 0x61, 0x6d, 0x43, 0x45, 0x60, - 0x5c, 0xec, 0xb2, 0xc8, 0xf7, 0x27, 0x38, 0x7e, 0x7b, 0xbc, 0x3f, 0x89, 0x6b, 0x9a, 0xaf, 0xe9, - 0x63, 0x2b, 0x59, 0x75, 0x7d, 0x8a, 0x8e, 0xf0, 0x8a, 0xb3, 0xdb, 0xda, 0xac, 0x4f, 0x52, 0xed, - 0x76, 0x08, 0x3f, 0x9c, 0x74, 0xeb, 0x50, 0xe6, 0xc6, 0x04, 0xee, 0x07, 0x9c, 0x77, 0x35, 0x85, - 0x77, 0xb2, 0xce, 0x2d, 0x05, 0x39, 0x89, 0x11, 0x99, 0xba, 0x62, 0x6d, 0xa2, 0xae, 0x78, 0x0d, - 0x79, 0x75, 0x40, 0x27, 0x3a, 0x7d, 0xfb, 0x32, 0x9d, 0x56, 0xc7, 0x76, 0xeb, 0x17, 0x17, 0xc3, - 0xda, 0xcf, 0xe7, 0xa8, 0x75, 0x76, 0x2f, 0xa6, 0xf4, 0x53, 0x0f, 0x48, 0x04, 0x80, 0xc2, 0x53, - 0xd6, 0xe5, 0x5a, 0xb7, 0x6f, 0x2d, 0xae, 0x6a, 0x5a, 0xf7, 0x62, 0x52, 0xbc, 0xff, 0x41, 0x51, - 0xf4, 0x46, 0xd5, 0x1c, 0x1f, 0x1f, 0x15, 0xa6, 0x1c, 0xf2, 0xf2, 0x93, 0xe9, 0xee, 0xc5, 0xb0, - 0xd6, 0x9c, 0x9b, 0x4b, 0x97, 0x1d, 0x13, 0x21, 0xe4, 0x93, 0xc4, 0x6d, 0x7f, 0x70, 0xe2, 0xce, - 0xa1, 0xce, 0xd4, 0xa0, 0xce, 0x95, 0xcb, 0xd8, 0xbf, 0xad, 0xc0, 0xe6, 0x14, 0x7d, 0xc8, 0x29, - 0xdc, 0xc8, 0x70, 0x45, 0x71, 0xe2, 0x1d, 0xd3, 0xf7, 0xba, 0x37, 0x19, 0x4f, 0x27, 0x4b, 0x73, - 0x8e, 0x1a, 0xa8, 0xd3, 0x66, 0x46, 0xd6, 0xff, 0x14, 0xaa, 0x2e, 0x06, 0xf4, 0x5c, 0x9f, 0x35, - 0xc2, 0x16, 0xa8, 0xb3, 0x77, 0x63, 0xdc, 0xdf, 0x8e, 0xbb, 0x63, 0xb9, 0x4f, 0x41, 0xe5, 0x2e, - 0x60, 0x20, 0x53, 0x77, 0xc5, 0xdc, 0x1c, 0x5b, 0x8e, 0x94, 0x81, 0xb4, 0x60, 0x3b, 0x05, 0x67, - 0xf8, 0x4a, 0x58, 0x67, 0x5c, 0xf4, 0x55, 0xba, 0xce, 0x28, 0xc7, 0x53, 0xc1, 0x7f, 0x8d, 0xaf, - 0xc4, 0xaf, 0xb8, 0xe8, 0x93, 0x3f, 0xe6, 0xa0, 0x9c, 0xfe, 0x1e, 0xe3, 0xe4, 0x1d, 0x09, 0xfb, - 0x50, 0x67, 0xc9, 0x87, 0x25, 0x68, 0x29, 0xb5, 0x4e, 0x57, 0x88, 0x48, 0xff, 0x5a, 0x83, 0x7c, - 0x72, 0x20, 0xfd, 0x12, 0x36, 0x26, 0x45, 0x74, 0x31, 0x65, 0x2a, 0x76, 0x46, 0x55, 0xef, 0x81, - 0xc1, 0x19, 0x5a, 0x82, 0x5b, 0xf1, 0xcf, 0x0c, 0xe1, 0x37, 0xb7, 0xb8, 0x2e, 0x98, 0x9e, 0xa4, - 0xb4, 0xfe, 0x47, 0xb0, 0x1e, 0x8b, 0xef, 0x94, 0xd4, 0x97, 0x55, 0xaf, 0x46, 0xbd, 0x80, 0x92, - 0x08, 0xa2, 0x50, 0x58, 0x3e, 0x9e, 0xa3, 0xaf, 0xaf, 0x6b, 0x3f, 0x59, 0x94, 0xf4, 0x8d, 0xd3, - 0x18, 0xff, 0x4d, 0x0c, 0x9f, 0x41, 0x0d, 0x10, 0x23, 0x6b, 0x46, 0xcb, 0x57, 0x27, 0xb4, 0xdc, - 0x80, 0x7c, 0xc7, 0xe7, 0xce, 0x4b, 0x74, 0xa5, 0xcc, 0x17, 0xcc, 0xa4, 0x49, 0xbe, 0x85, 0xf5, - 0x40, 0x95, 0x73, 0x92, 0xe3, 0x51, 0x28, 0xcb, 0x94, 0xf5, 0x3b, 0x5f, 0x2c, 0x9c, 0x94, 0xae, - 0x00, 0xdb, 0xd2, 0xc3, 0xac, 0x04, 0xe9, 0x26, 0x79, 0x0d, 0xd5, 0xc9, 0x15, 0xd4, 0xf4, 0xbc, - 0x4c, 0xc2, 0xdf, 0xa1, 0xce, 0x3f, 0x98, 0x60, 0x64, 0x25, 0xb3, 0x19, 0x57, 0x88, 0x93, 0xdf, - 0x01, 0x8c, 0xb7, 0x8e, 0x94, 0x20, 0xff, 0x9c, 0xbd, 0x64, 0xfc, 0xf7, 0xac, 0xba, 0xa4, 0x4a, - 0x70, 0xb9, 0x73, 0xe8, 0x56, 0x73, 0x71, 0x09, 0x7e, 0xe8, 0x38, 0xd8, 0x8f, 0x5b, 0xd7, 0x62, - 0xe4, 0xa9, 0x36, 0x2d, 0x93, 0x4d, 0xa8, 0x3c, 0xf7, 0x05, 0xed, 0xd9, 0x02, 0x65, 0x67, 0x75, - 0xa5, 0x7e, 0x06, 0x95, 0xcc, 0xea, 0x13, 0x03, 0xb6, 0x75, 0xe8, 0x4c, 0x7f, 0x75, 0x89, 0x6c, - 0xc1, 0xc6, 0x44, 0xc9, 0x5e, 0xcd, 0xc5, 0x9d, 0xc7, 0x91, 0xf0, 0x78, 0xaa, 0xf3, 0x5a, 0xdc, - 0x99, 0x4c, 0x21, 0xe9, 0x5c, 0xae, 0x0f, 0x97, 0x21, 0x9f, 0xdc, 0x62, 0x3f, 0xa6, 0xd4, 0xdf, - 0x87, 0x22, 0x32, 0x11, 0x0c, 0xe2, 0x0b, 0xa4, 0xae, 0x9d, 0x66, 0xbc, 0x39, 0x48, 0xc8, 0x11, - 0x75, 0x49, 0x0d, 0x4a, 0xfa, 0xe6, 0x9d, 0x4a, 0x23, 0xd0, 0x5d, 0x71, 0xbc, 0x87, 0x8b, 0x0f, - 0x08, 0x55, 0x32, 0xcd, 0x3d, 0x08, 0xfe, 0x00, 0x6b, 0xfa, 0xdd, 0x41, 0x71, 0xf2, 0x5d, 0xab, - 0x9a, 0xaf, 0x2e, 0x86, 0xb5, 0x07, 0x8b, 0x45, 0x33, 0x3b, 0x91, 0x49, 0xed, 0xd4, 0xc3, 0x5e, - 0x21, 0x8a, 0xfe, 0x63, 0x05, 0x2a, 0xcf, 0x06, 0x21, 0xfa, 0xdd, 0xe4, 0x89, 0xe6, 0x63, 0xc5, - 0xf3, 0x3e, 0x18, 0xd3, 0xa5, 0xa8, 0xbe, 0x7e, 0x29, 0xf1, 0xfc, 0xc4, 0x9e, 0x28, 0x43, 0xd5, - 0x15, 0xec, 0x73, 0xa8, 0x84, 0x67, 0x76, 0x80, 0xa3, 0x87, 0x11, 0xad, 0x9e, 0xaa, 0x53, 0x3f, - 0x78, 0x7c, 0x05, 0x37, 0xfb, 0x51, 0xc7, 0xa7, 0x8e, 0x15, 0x20, 0x73, 0xf1, 0xf5, 0x39, 0x8f, - 0x42, 0xab, 0xcf, 0x29, 0x13, 0x56, 0x88, 0xe8, 0xea, 0x9d, 0xff, 0x81, 0xc2, 0x98, 0x23, 0xc8, - 0x49, 0x8c, 0x68, 0x23, 0xba, 0xe4, 0x31, 0xd4, 0xe6, 0x05, 0x40, 0x66, 0x77, 0x7c, 0x74, 0xa5, - 0x72, 0x16, 0xcc, 0x9b, 0x33, 0x63, 0x3c, 0x56, 0x18, 0x72, 0x03, 0x8a, 0x21, 0xf5, 0x2c, 0xe7, - 0xcc, 0xa6, 0xc9, 0xfd, 0xaf, 0x10, 0x52, 0xef, 0x28, 0x6e, 0x93, 0xfe, 0x64, 0xd9, 0xfc, 0xd9, - 0x4c, 0x82, 0xa9, 0x75, 0xd7, 0xdc, 0x9a, 0x5d, 0x45, 0x5e, 0x56, 0xd0, 0x25, 0xc5, 0xf2, 0xd5, - 0x21, 0xd4, 0x9f, 0x97, 0xa1, 0x9c, 0xfe, 0x30, 0xf2, 0x10, 0xd6, 0xdf, 0xab, 0x7c, 0x2b, 0xbb, + 0xfb, 0x62, 0xd0, 0xc7, 0xb0, 0x29, 0x68, 0x0f, 0x43, 0x61, 0xf7, 0xfa, 0xe3, 0x2f, 0x15, 0x64, + 0x67, 0x3f, 0xe3, 0xec, 0xf1, 0xb1, 0x6b, 0xdc, 0x92, 0x0d, 0xf9, 0xa5, 0xe0, 0xf5, 0xff, 0x16, + 0xa1, 0xf8, 0x24, 0xe0, 0x51, 0xff, 0x29, 0xeb, 0x72, 0x72, 0x00, 0x15, 0x2f, 0x6e, 0x58, 0xfd, + 0xa8, 0x63, 0xbd, 0xc4, 0x81, 0x91, 0xdb, 0xcd, 0xed, 0x95, 0x5b, 0x9f, 0x5e, 0x0c, 0x6b, 0xc4, + 0xe3, 0x41, 0xef, 0xa0, 0xde, 0x0f, 0x68, 0xcf, 0x0e, 0x06, 0xb1, 0xb1, 0x6e, 0x96, 0x24, 0xf8, + 0x24, 0xea, 0x7c, 0x8d, 0x03, 0xf2, 0x05, 0x6c, 0x2a, 0xdf, 0x90, 0x7a, 0x8c, 0x32, 0x4f, 0xfa, + 0x5f, 0x8b, 0xfd, 0xcd, 0x0d, 0x69, 0x68, 0xab, 0xfe, 0x18, 0xbb, 0x03, 0x85, 0x1e, 0x0a, 0xdb, + 0xb5, 0x85, 0x6d, 0x2c, 0x4b, 0xc8, 0xa8, 0x4d, 0x5e, 0x40, 0xc1, 0x8e, 0x5c, 0x8a, 0xcc, 0x41, + 0x63, 0x65, 0x37, 0xb7, 0xb7, 0x7e, 0xe7, 0x67, 0x8d, 0x19, 0xab, 0xd4, 0x18, 0xcd, 0x5a, 0x7d, + 0x1d, 0x6a, 0x9f, 0x56, 0xf5, 0x62, 0x58, 0x2b, 0xab, 0xc9, 0x52, 0xe6, 0xe2, 0xab, 0xba, 0x39, + 0x8a, 0x47, 0x0c, 0xc8, 0x9f, 0x63, 0x10, 0x52, 0xce, 0x8c, 0xd5, 0xdd, 0xdc, 0x5e, 0xc5, 0x4c, + 0x9a, 0xe4, 0x4b, 0xf8, 0x24, 0x44, 0xbf, 0x6b, 0xf5, 0x03, 0x7a, 0x1e, 0xcf, 0xdc, 0xb2, 0x1d, + 0x87, 0x47, 0x4c, 0x18, 0x6b, 0x72, 0x7a, 0x24, 0x36, 0x9e, 0x04, 0xf4, 0xfc, 0x6b, 0x1c, 0x1c, + 0x2a, 0x0b, 0x69, 0xc2, 0x76, 0xd6, 0xc5, 0xc5, 0x73, 0xea, 0xa0, 0x91, 0x97, 0x1e, 0x9b, 0x29, + 0x8f, 0x47, 0xd2, 0x30, 0x72, 0xa0, 0xec, 0x9c, 0x0a, 0x0c, 0x46, 0x8b, 0x5c, 0x18, 0x3b, 0x3c, + 0x55, 0x26, 0xbd, 0xa4, 0xf7, 0xe0, 0x7a, 0x82, 0x75, 0x38, 0x13, 0xb6, 0x23, 0x46, 0x3e, 0x45, + 0xe9, 0xb3, 0xad, 0xcd, 0x47, 0xca, 0xaa, 0xdd, 0x7e, 0x0b, 0x37, 0x78, 0xd0, 0xa1, 0xc2, 0xed, + 0x58, 0x4e, 0x14, 0x04, 0xc8, 0x84, 0xe5, 0x50, 0xd7, 0xea, 0x61, 0x18, 0xda, 0x1e, 0x1a, 0x20, + 0xf7, 0xf4, 0xe6, 0x9b, 0x61, 0xcd, 0x38, 0x8e, 0x61, 0x8f, 0x5a, 0x47, 0x0a, 0x75, 0xf4, 0xf4, + 0xd1, 0x33, 0x85, 0x31, 0x0d, 0x1d, 0x20, 0xb1, 0x50, 0x57, 0x5b, 0xc8, 0x6f, 0x60, 0x67, 0x56, + 0xf0, 0x10, 0x9d, 0x00, 0x85, 0x51, 0x92, 0xb1, 0x6f, 0xbc, 0x19, 0xd6, 0xae, 0x4f, 0xc5, 0x6e, + 0x4b, 0x88, 0x79, 0x7d, 0x2a, 0xb4, 0x32, 0xcc, 0x9b, 0x76, 0x88, 0x42, 0x50, 0xe6, 0x19, 0xe5, + 0x05, 0xd3, 0x6e, 0x2b, 0xcc, 0x8c, 0x69, 0x6b, 0xcb, 0xbc, 0x69, 0xf7, 0xb0, 0xd7, 0xc1, 0xc0, + 0xa8, 0x2c, 0x98, 0xf6, 0x33, 0x09, 0x99, 0x31, 0x6d, 0x65, 0x20, 0x3d, 0xc8, 0xab, 0x28, 0xa1, + 0x71, 0xb2, 0xbb, 0xbc, 0x57, 0xba, 0xb3, 0x3b, 0x9f, 0xae, 0xca, 0xa5, 0xf5, 0xe5, 0xc5, 0xb0, + 0xb6, 0xaf, 0x28, 0xda, 0xe5, 0x01, 0x52, 0x8f, 0xbd, 0xc4, 0xc1, 0x41, 0x26, 0xf3, 0x1e, 0x9c, + 0x98, 0x8f, 0xbf, 0x39, 0x3e, 0x7c, 0x74, 0xd0, 0xb5, 0xfd, 0x10, 0xeb, 0x66, 0x32, 0x06, 0x09, + 0x21, 0xaf, 0x37, 0xdd, 0xf8, 0x76, 0x37, 0xb7, 0x57, 0xba, 0x73, 0x73, 0xe6, 0x70, 0x9a, 0x11, + 0xad, 0x07, 0x17, 0xc3, 0xda, 0xfd, 0xa9, 0xa1, 0xe6, 0xb0, 0x6a, 0x6a, 0x50, 0x8d, 0x23, 0x47, + 0x00, 0x4e, 0x80, 0xb6, 0x40, 0xd7, 0xb2, 0x85, 0xd1, 0x91, 0xe3, 0xee, 0x34, 0x3c, 0xce, 0x3d, + 0x1f, 0x1b, 0x89, 0xc0, 0x34, 0x4e, 0x13, 0x29, 0x6a, 0x15, 0xfe, 0x3e, 0xac, 0x2d, 0x7d, 0xff, + 0x9f, 0x5a, 0xce, 0x2c, 0x6a, 0xbf, 0x43, 0x11, 0x07, 0x89, 0xfa, 0x6e, 0x12, 0xc4, 0x79, 0x9f, + 0x20, 0xda, 0xef, 0x50, 0xd4, 0x0f, 0xa1, 0x92, 0x49, 0x77, 0x52, 0x81, 0xe2, 0x73, 0xe6, 0x62, + 0x97, 0x32, 0x74, 0xab, 0x4b, 0xa4, 0x0c, 0x85, 0x63, 0x86, 0xa7, 0xfc, 0x98, 0x61, 0x35, 0x47, + 0x8a, 0xb0, 0x2a, 0xd1, 0xd5, 0x6b, 0xa4, 0x00, 0x2b, 0x6d, 0xf4, 0xbb, 0xd5, 0xe5, 0xfa, 0x5f, + 0x56, 0x61, 0x5b, 0x8b, 0x87, 0xc3, 0x7b, 0x31, 0x6d, 0xf0, 0x77, 0x11, 0x86, 0xe2, 0xa3, 0xd4, + 0xef, 0x2e, 0x7c, 0x9a, 0x2c, 0xaa, 0xda, 0xa9, 0x51, 0x10, 0x25, 0x81, 0x5b, 0xda, 0xaa, 0x18, + 0xa0, 0x9d, 0x7e, 0x02, 0xeb, 0xb2, 0xdb, 0x16, 0x94, 0xb3, 0x58, 0x37, 0xb5, 0x18, 0x56, 0xc6, + 0xbd, 0x6d, 0xea, 0x91, 0x06, 0x6c, 0xa5, 0x60, 0x89, 0xdc, 0x48, 0x71, 0x2c, 0x9b, 0x9b, 0x63, + 0x93, 0x56, 0x9b, 0xd9, 0x4a, 0xbc, 0x3a, 0x5b, 0x89, 0x3f, 0x4b, 0xfe, 0x73, 0xa2, 0x8b, 0x4a, + 0xef, 0xca, 0xb2, 0xf3, 0x3b, 0x2d, 0x8e, 0xfb, 0x40, 0x30, 0x0c, 0x91, 0x09, 0x6a, 0xfb, 0xd6, + 0x48, 0xb8, 0xb5, 0xce, 0x8d, 0x2c, 0xcf, 0x12, 0x05, 0xff, 0x40, 0xd9, 0xfa, 0x53, 0x0e, 0x36, + 0x26, 0xfc, 0xa4, 0x34, 0xfe, 0x5f, 0x29, 0xbe, 0x9e, 0x9d, 0xca, 0x15, 0x62, 0xfa, 0x5f, 0xf3, + 0x50, 0x4a, 0x89, 0x06, 0x79, 0x02, 0xdb, 0x6a, 0xa7, 0x26, 0xf8, 0xb5, 0x98, 0xa4, 0x8a, 0x09, + 0x19, 0xd6, 0xdd, 0x9f, 0xa4, 0xb9, 0x64, 0x68, 0x6b, 0xeb, 0x62, 0x58, 0xdb, 0x50, 0x11, 0x18, + 0x17, 0xbb, 0x2c, 0xf2, 0xfd, 0x09, 0x8e, 0xdf, 0x1e, 0xef, 0x4f, 0xe2, 0x9a, 0xe6, 0x6b, 0xfa, + 0xd8, 0x4a, 0x56, 0x5d, 0x9f, 0xa2, 0x23, 0xbc, 0xe2, 0xec, 0xb6, 0x36, 0xeb, 0x93, 0x54, 0xbb, + 0x1d, 0xc2, 0x0f, 0x27, 0xdd, 0x3a, 0x94, 0xb9, 0x31, 0x81, 0xfb, 0x01, 0xe7, 0x5d, 0x4d, 0xe1, + 0x9d, 0xac, 0x73, 0x4b, 0x41, 0x4e, 0x62, 0x44, 0xa6, 0xae, 0x58, 0x9b, 0xa8, 0x2b, 0x5e, 0x43, + 0x5e, 0x1d, 0xd0, 0x89, 0x4e, 0xdf, 0xbe, 0x4c, 0xa7, 0xd5, 0xb1, 0xdd, 0xfa, 0xc5, 0xc5, 0xb0, + 0xf6, 0xf3, 0x39, 0x6a, 0x9d, 0xdd, 0x8b, 0x29, 0xfd, 0xd4, 0x03, 0x12, 0x01, 0xa0, 0xf0, 0x94, + 0x75, 0xb9, 0xd6, 0xed, 0x5b, 0x8b, 0xab, 0x9a, 0xd6, 0xbd, 0x98, 0x14, 0xef, 0x7f, 0x50, 0x14, + 0xbd, 0x51, 0x35, 0xc7, 0xc7, 0x47, 0x85, 0x29, 0x87, 0xbc, 0xfc, 0x64, 0xba, 0x7b, 0x31, 0xac, + 0x35, 0xe7, 0xe6, 0xd2, 0x65, 0xc7, 0x44, 0x08, 0xf9, 0x24, 0x71, 0xdb, 0x1f, 0x9c, 0xb8, 0x73, + 0xa8, 0x33, 0x35, 0xa8, 0x73, 0xe5, 0x32, 0xf6, 0x6f, 0x2b, 0xb0, 0x39, 0x45, 0x1f, 0x72, 0x0a, + 0x37, 0x32, 0x5c, 0x51, 0x9c, 0x78, 0xc7, 0xf4, 0xbd, 0xee, 0x4d, 0xc6, 0xd3, 0xc9, 0xd2, 0x9c, + 0xa3, 0x06, 0xea, 0xb4, 0x99, 0x91, 0xf5, 0x3f, 0x85, 0xaa, 0x8b, 0x01, 0x3d, 0xd7, 0x67, 0x8d, + 0xb0, 0x05, 0xea, 0xec, 0xdd, 0x18, 0xf7, 0xb7, 0xe3, 0xee, 0x58, 0xee, 0x53, 0x50, 0xb9, 0x0b, + 0x18, 0xc8, 0xd4, 0x5d, 0x31, 0x37, 0xc7, 0x96, 0x23, 0x65, 0x20, 0x2d, 0xd8, 0x4e, 0xc1, 0x19, + 0xbe, 0x12, 0xd6, 0x19, 0x17, 0x7d, 0x95, 0xae, 0x33, 0xca, 0xf1, 0x54, 0xf0, 0x5f, 0xe3, 0x2b, + 0xf1, 0x2b, 0x2e, 0xfa, 0xe4, 0x8f, 0x39, 0x28, 0xa7, 0xff, 0x8f, 0x71, 0xf2, 0x8e, 0x84, 0x7d, + 0xa8, 0xb3, 0xe4, 0xc3, 0x12, 0xb4, 0x94, 0x5a, 0xa7, 0x2b, 0x44, 0xa4, 0x7f, 0xad, 0x41, 0x3e, + 0x39, 0x90, 0x7e, 0x09, 0x1b, 0x93, 0x22, 0xba, 0x98, 0x32, 0x15, 0x3b, 0xa3, 0xaa, 0xf7, 0xc0, + 0xe0, 0x0c, 0x2d, 0xc1, 0xad, 0xf8, 0x67, 0x86, 0xf0, 0x9b, 0x5b, 0x5c, 0x17, 0x4c, 0x4f, 0x52, + 0x5a, 0xff, 0x63, 0x58, 0x8f, 0xc5, 0x77, 0x4a, 0xea, 0xcb, 0xaa, 0x57, 0xa3, 0x5e, 0x40, 0x49, + 0x04, 0x51, 0x28, 0x2c, 0x1f, 0xcf, 0xd1, 0xd7, 0xd7, 0xb5, 0xcf, 0x17, 0x25, 0x7d, 0xe3, 0x34, + 0xc6, 0x7f, 0x13, 0xc3, 0x67, 0x50, 0x03, 0xc4, 0xc8, 0x9a, 0xd1, 0xf2, 0xd5, 0x09, 0x2d, 0x37, + 0x20, 0xdf, 0xf1, 0xb9, 0xf3, 0x12, 0x5d, 0x29, 0xf3, 0x05, 0x33, 0x69, 0x92, 0x6f, 0x61, 0x3d, + 0x50, 0xe5, 0x9c, 0xe4, 0x78, 0x14, 0xca, 0x32, 0x65, 0xfd, 0xce, 0x17, 0x0b, 0x27, 0xa5, 0x2b, + 0xc0, 0xb6, 0xf4, 0x30, 0x2b, 0x41, 0xba, 0x49, 0x5e, 0x43, 0x75, 0x72, 0x05, 0x35, 0x3d, 0x2f, + 0x93, 0xf0, 0x77, 0xa8, 0xf3, 0x0f, 0x26, 0x18, 0x59, 0xc9, 0x6c, 0xc6, 0x15, 0xe2, 0xe4, 0x77, + 0x00, 0xe3, 0xad, 0x23, 0x25, 0xc8, 0x3f, 0x67, 0x2f, 0x19, 0xff, 0x3d, 0xab, 0x2e, 0xa9, 0x12, + 0x5c, 0xee, 0x1c, 0xba, 0xd5, 0x5c, 0x5c, 0x82, 0x1f, 0x3a, 0x0e, 0xf6, 0xe3, 0xd6, 0xb5, 0x18, + 0x79, 0xaa, 0x4d, 0xcb, 0x64, 0x13, 0x2a, 0xcf, 0x7d, 0x41, 0x7b, 0xb6, 0x40, 0xd9, 0x59, 0x5d, + 0xa9, 0x9f, 0x41, 0x25, 0xb3, 0xfa, 0xc4, 0x80, 0x6d, 0x1d, 0x3a, 0xd3, 0x5f, 0x5d, 0x22, 0x5b, + 0xb0, 0x31, 0x51, 0xb2, 0x57, 0x73, 0x71, 0xe7, 0x71, 0x24, 0x3c, 0x9e, 0xea, 0xbc, 0x16, 0x77, + 0x26, 0x53, 0x48, 0x3a, 0x97, 0xeb, 0xc3, 0x65, 0xc8, 0x27, 0xb7, 0xd8, 0x8f, 0x29, 0xf5, 0xf7, + 0xa1, 0x88, 0x4c, 0x04, 0x83, 0xf8, 0x02, 0xa9, 0x6b, 0xa7, 0x19, 0x6f, 0x0e, 0x12, 0x72, 0x44, + 0x5d, 0x52, 0x83, 0x92, 0xbe, 0x79, 0xa7, 0xd2, 0x08, 0x74, 0x57, 0x1c, 0xef, 0xe1, 0xe2, 0x03, + 0x42, 0x95, 0x4c, 0x73, 0x0f, 0x82, 0x3f, 0xc0, 0x9a, 0x7e, 0x77, 0x50, 0x9c, 0x7c, 0xd7, 0xaa, + 0xe6, 0xab, 0x8b, 0x61, 0xed, 0xc1, 0x62, 0xd1, 0xcc, 0x4e, 0x64, 0x52, 0x3b, 0xf5, 0xb0, 0x57, + 0x88, 0xa2, 0xff, 0x58, 0x81, 0xca, 0xb3, 0x41, 0x88, 0x7e, 0x37, 0x79, 0xa2, 0xf9, 0x58, 0xf1, + 0xbc, 0x0f, 0xc6, 0x74, 0x29, 0xaa, 0xaf, 0x5f, 0x4a, 0x3c, 0x3f, 0xb1, 0x27, 0xca, 0x50, 0x75, + 0x05, 0xfb, 0x0c, 0x2a, 0xe1, 0x99, 0x1d, 0xe0, 0xe8, 0x61, 0x44, 0xab, 0xa7, 0xea, 0xd4, 0x0f, + 0x1e, 0x5f, 0xc1, 0xcd, 0x7e, 0xd4, 0xf1, 0xa9, 0x63, 0x05, 0xc8, 0x5c, 0x7c, 0x7d, 0xce, 0xa3, + 0xd0, 0xea, 0x73, 0xca, 0x84, 0x15, 0x22, 0xba, 0x7a, 0xe7, 0x7f, 0xa0, 0x30, 0xe6, 0x08, 0x72, + 0x12, 0x23, 0xda, 0x88, 0x2e, 0x79, 0x0c, 0xb5, 0x79, 0x01, 0x90, 0xd9, 0x1d, 0x1f, 0x5d, 0xa9, + 0x9c, 0x05, 0xf3, 0xe6, 0xcc, 0x18, 0x8f, 0x15, 0x86, 0xdc, 0x80, 0x62, 0x48, 0x3d, 0xcb, 0x39, + 0xb3, 0x69, 0x72, 0xff, 0x2b, 0x84, 0xd4, 0x3b, 0x8a, 0xdb, 0xa4, 0x3f, 0x59, 0x36, 0xff, 0x68, + 0x26, 0xc1, 0xd4, 0xba, 0x6b, 0x6e, 0xcd, 0xae, 0x22, 0x2f, 0x2b, 0xe8, 0x92, 0x62, 0xf9, 0xea, + 0x10, 0xea, 0xcf, 0xcb, 0x50, 0x4e, 0xff, 0x31, 0xf2, 0x10, 0xd6, 0xdf, 0xab, 0x7c, 0x2b, 0xbb, 0xe9, 0x54, 0xbd, 0x0d, 0x1b, 0x89, 0x77, 0x96, 0x44, 0x15, 0x0d, 0xd3, 0xe4, 0xb9, 0x3d, 0xcd, 0x5a, 0x7d, 0xcf, 0xca, 0xb2, 0x33, 0x82, 0x7c, 0xf2, 0x4a, 0xa9, 0x72, 0xbf, 0xbe, 0x60, 0x6b, - 0x92, 0xeb, 0xd2, 0x7d, 0x5d, 0x30, 0xbd, 0xff, 0xfe, 0x68, 0xfb, 0xd5, 0xd9, 0x9f, 0x56, 0xf3, - 0xfb, 0xb7, 0xb7, 0x96, 0xfe, 0xf9, 0xf6, 0xd6, 0xd2, 0xbf, 0xdf, 0xde, 0x5a, 0x7a, 0xf1, 0x99, - 0xfa, 0x78, 0x81, 0xce, 0x59, 0xd3, 0xe3, 0xcd, 0xa9, 0x77, 0x77, 0xb7, 0xd3, 0x59, 0x93, 0xff, - 0xef, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x82, 0xd1, 0xa0, 0xd6, 0x98, 0x17, 0x00, 0x00, + 0x92, 0xeb, 0xd2, 0x7d, 0x5d, 0x30, 0xbd, 0xff, 0xfe, 0x68, 0xfb, 0xd5, 0xd9, 0x9f, 0xd6, 0xbd, + 0xef, 0xdf, 0xde, 0x5a, 0xfa, 0xe7, 0xdb, 0x5b, 0x4b, 0xff, 0x7e, 0x7b, 0x6b, 0xe9, 0xc5, 0xe7, + 0xea, 0xcf, 0x0b, 0x74, 0xce, 0x9a, 0xf2, 0xb3, 0xe9, 0xf1, 0xe6, 0xd4, 0xeb, 0xbb, 0xdb, 0xe9, + 0xac, 0xc9, 0xef, 0xbb, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x74, 0x6c, 0x7f, 0x55, 0x9e, 0x17, + 0x00, 0x00, } diff --git a/go/internal/protocoldb/protocolmodel_test.go b/go/internal/protocoldb/protocolmodel_test.go index de48d0a138..a2fbd3b0ba 100644 --- a/go/internal/protocoldb/protocolmodel_test.go +++ b/go/internal/protocoldb/protocolmodel_test.go @@ -3,7 +3,7 @@ package protocoldb import ( "testing" - "berty.tech/go/internal/testutil" + "berty.tech/berty/go/internal/testutil" ) func TestUsage(t *testing.T) { diff --git a/go/internal/testutil/doc.go b/go/internal/testutil/doc.go index 4a7bb8232e..fd4e994093 100644 --- a/go/internal/testutil/doc.go +++ b/go/internal/testutil/doc.go @@ -1 +1 @@ -package testutil // import "berty.tech/go/internal/testutil" +package testutil // import "berty.tech/berty/go/internal/testutil" diff --git a/go/pkg/bertyprotocol/api_app.go b/go/pkg/bertyprotocol/api_app.go index b9e96c270c..13321a5138 100644 --- a/go/pkg/bertyprotocol/api_app.go +++ b/go/pkg/bertyprotocol/api_app.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) func (c *client) AccountAppendAppSpecificEvent(context.Context, *AccountAppendAppSpecificEvent_Request) (*AccountAppendAppSpecificEvent_Reply, error) { diff --git a/go/pkg/bertyprotocol/api_client.go b/go/pkg/bertyprotocol/api_client.go index aa7893a7c1..23453fc033 100644 --- a/go/pkg/bertyprotocol/api_client.go +++ b/go/pkg/bertyprotocol/api_client.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) func (c *client) InstanceExportData(context.Context, *InstanceExportData_Request) (*InstanceExportData_Reply, error) { diff --git a/go/pkg/bertyprotocol/api_contact.go b/go/pkg/bertyprotocol/api_contact.go index 2d1edbf128..97e79d3074 100644 --- a/go/pkg/bertyprotocol/api_contact.go +++ b/go/pkg/bertyprotocol/api_contact.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) // ContactRemove removes a contact diff --git a/go/pkg/bertyprotocol/api_contactrequest.go b/go/pkg/bertyprotocol/api_contactrequest.go index 1a808d2e9d..f21cc9f663 100644 --- a/go/pkg/bertyprotocol/api_contactrequest.go +++ b/go/pkg/bertyprotocol/api_contactrequest.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) // ContactRequestReference retrieves the necessary information to create a contact link diff --git a/go/pkg/bertyprotocol/api_device.go b/go/pkg/bertyprotocol/api_device.go index 1af8745e10..8c7c87bfde 100644 --- a/go/pkg/bertyprotocol/api_device.go +++ b/go/pkg/bertyprotocol/api_device.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) // DevicePair pairs a new device to the current account diff --git a/go/pkg/bertyprotocol/api_event.go b/go/pkg/bertyprotocol/api_event.go index 078093630e..9cd6cdf9a5 100644 --- a/go/pkg/bertyprotocol/api_event.go +++ b/go/pkg/bertyprotocol/api_event.go @@ -1,6 +1,6 @@ package bertyprotocol -import "berty.tech/go/pkg/errcode" +import "berty.tech/berty/go/pkg/errcode" // AccountSubscribe subscribes to the account events func (c *client) AccountSubscribe(*AccountSubscribe_Request, ProtocolService_AccountSubscribeServer) error { diff --git a/go/pkg/bertyprotocol/api_group.go b/go/pkg/bertyprotocol/api_group.go index ebe4392e0e..98d71af0d6 100644 --- a/go/pkg/bertyprotocol/api_group.go +++ b/go/pkg/bertyprotocol/api_group.go @@ -3,7 +3,7 @@ package bertyprotocol import ( "context" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/pkg/errcode" ) // GroupCreate initiates a new group and joins it diff --git a/go/pkg/bertyprotocol/bertyprotocol.pb.go b/go/pkg/bertyprotocol/bertyprotocol.pb.go index 0c3afdbb47..b9ee8df62c 100644 --- a/go/pkg/bertyprotocol/bertyprotocol.pb.go +++ b/go/pkg/bertyprotocol/bertyprotocol.pb.go @@ -3087,116 +3087,116 @@ func init() { func init() { proto.RegisterFile("bertyprotocol.proto", fileDescriptor_047e04c733cf8554) } var fileDescriptor_047e04c733cf8554 = []byte{ - // 1740 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x6d, 0x6f, 0x1b, 0xc7, - 0x11, 0x0e, 0x49, 0x51, 0x32, 0x87, 0xa4, 0x74, 0xd9, 0xca, 0xa9, 0x4a, 0xa8, 0x95, 0x44, 0xd9, - 0xaa, 0x20, 0xdb, 0x94, 0xa3, 0x20, 0x48, 0x81, 0xf4, 0x43, 0x4d, 0x53, 0x10, 0x14, 0xd9, 0x88, - 0x72, 0xaa, 0x0a, 0x23, 0x45, 0xcb, 0xde, 0xcb, 0x90, 0xb9, 0x88, 0xba, 0xbb, 0xdc, 0x2d, 0xe9, - 0x12, 0x08, 0x9a, 0x1f, 0xd0, 0x7f, 0xd2, 0x0f, 0x05, 0xf2, 0xb1, 0x7f, 0xa5, 0x28, 0x04, 0xd4, - 0xff, 0xa2, 0xdf, 0x8a, 0x7d, 0xb9, 0x3d, 0xf2, 0x5e, 0xf8, 0x52, 0xa5, 0x40, 0xfb, 0xed, 0x76, - 0xe7, 0x99, 0x67, 0x66, 0x67, 0x67, 0x46, 0xc3, 0x15, 0xfc, 0xc8, 0xc4, 0x80, 0x8e, 0xfd, 0xc0, - 0xa3, 0x9e, 0xe5, 0x0d, 0x5a, 0xfc, 0x83, 0xac, 0xf3, 0xcd, 0x56, 0xb4, 0xdb, 0x78, 0xd6, 0x77, - 0xe8, 0x57, 0x43, 0xb3, 0x65, 0x79, 0xb7, 0xc7, 0x7d, 0xaf, 0xef, 0x1d, 0x73, 0x89, 0x39, 0xec, - 0xf1, 0x15, 0x5f, 0xf0, 0x2f, 0xa1, 0xd1, 0x7c, 0x0d, 0xe4, 0xdc, 0x0d, 0xa9, 0xe1, 0x5a, 0x78, - 0xfa, 0x47, 0xdf, 0x0b, 0x68, 0xc7, 0xa0, 0x46, 0xa3, 0x02, 0x6b, 0x3a, 0x7e, 0x33, 0xc4, 0x90, - 0x36, 0x9e, 0x42, 0x59, 0x47, 0x7f, 0x30, 0x26, 0xfb, 0x50, 0x47, 0x8e, 0x40, 0xbb, 0x6b, 0x1b, - 0xd4, 0xd8, 0x2a, 0xec, 0x16, 0x0e, 0x6b, 0x7a, 0x2d, 0xda, 0x64, 0x8a, 0xcd, 0xbf, 0xac, 0xc0, - 0x56, 0xc4, 0x77, 0x86, 0xf4, 0xa5, 0xe7, 0xf6, 0x9c, 0xfe, 0x30, 0x30, 0xa8, 0xe3, 0xb9, 0x93, - 0xac, 0x7f, 0x2b, 0xc5, 0xb4, 0x6b, 0x3e, 0x62, 0xd0, 0x75, 0x6c, 0x4e, 0x58, 0x69, 0xc3, 0xbb, - 0xbb, 0x9d, 0xd5, 0x4b, 0xc4, 0xe0, 0xbc, 0xa3, 0xaf, 0x32, 0xd1, 0xb9, 0x4d, 0xb6, 0xa1, 0x32, - 0x70, 0x42, 0x8a, 0x2e, 0x06, 0xe1, 0x56, 0x71, 0xb7, 0x74, 0x58, 0xd1, 0xe3, 0x0d, 0xf2, 0x1b, - 0xa8, 0x9a, 0x03, 0xec, 0xa2, 0x6b, 0x98, 0x03, 0xb4, 0xb7, 0x4a, 0xbb, 0x85, 0xc3, 0xf5, 0x93, - 0x8f, 0x5b, 0xd3, 0x81, 0x69, 0xe5, 0xb9, 0xd5, 0xba, 0x42, 0x4a, 0x1d, 0xb7, 0x7f, 0x45, 0x0d, - 0x8a, 0x3a, 0x98, 0x03, 0x3c, 0x15, 0x44, 0xa4, 0x0b, 0xda, 0x5b, 0xa7, 0xe7, 0x74, 0xfd, 0x13, - 0x5f, 0x91, 0xaf, 0xdc, 0x87, 0x7c, 0x9d, 0xd1, 0x5d, 0x9e, 0xf8, 0x91, 0x81, 0x37, 0x50, 0xbb, - 0xb5, 0xdd, 0x50, 0x91, 0x97, 0xef, 0x43, 0x5e, 0x65, 0x54, 0x11, 0xf3, 0x97, 0x50, 0x0f, 0x70, - 0x60, 0x8c, 0x15, 0xf5, 0xea, 0x7d, 0xa8, 0x6b, 0x9c, 0x4b, 0x72, 0x37, 0xcf, 0xa0, 0x36, 0x29, - 0x25, 0x55, 0x58, 0xbb, 0x76, 0x6f, 0x5c, 0xef, 0xad, 0xab, 0xbd, 0xc7, 0x16, 0x12, 0xa7, 0x15, - 0x48, 0x0d, 0x1e, 0x74, 0x9c, 0x50, 0xac, 0x8a, 0x64, 0x03, 0xaa, 0xd7, 0xae, 0x31, 0x32, 0x9c, - 0x01, 0xdb, 0xd1, 0x4a, 0xcd, 0xb7, 0xf0, 0xf0, 0x2c, 0xf0, 0x86, 0x7e, 0xc4, 0x86, 0xf4, 0x35, - 0xde, 0x9a, 0x18, 0x34, 0xae, 0x55, 0xa2, 0x90, 0x26, 0xd4, 0xfb, 0x0c, 0xd3, 0xf5, 0x87, 0x66, - 0xf7, 0x06, 0xc7, 0x32, 0xeb, 0xaa, 0x7c, 0xf3, 0x72, 0x68, 0x5e, 0xe0, 0x98, 0x68, 0x50, 0x62, - 0x92, 0x22, 0x4b, 0x1f, 0x9d, 0x7d, 0x92, 0x4d, 0x28, 0x8f, 0x8c, 0xc1, 0x10, 0x79, 0x2e, 0xd4, - 0x74, 0xb1, 0x68, 0xac, 0xc9, 0x9c, 0x6b, 0x8e, 0x60, 0x33, 0x61, 0x98, 0x2f, 0xff, 0xeb, 0x76, - 0xff, 0x59, 0x80, 0xc6, 0x94, 0x61, 0xea, 0x05, 0x78, 0x35, 0x34, 0x43, 0x2b, 0x70, 0x4c, 0x6c, - 0x7c, 0xbb, 0x9c, 0xf9, 0x4d, 0x28, 0x87, 0x8e, 0x6b, 0x21, 0x77, 0xa0, 0xa6, 0x8b, 0x05, 0xdb, - 0x1d, 0xba, 0xd4, 0x19, 0x44, 0x2e, 0xf0, 0x05, 0xd9, 0x83, 0x5a, 0xdf, 0xeb, 0x9a, 0x86, 0x75, - 0xf3, 0xd6, 0x08, 0xec, 0x90, 0xa7, 0xf1, 0x03, 0xbd, 0xda, 0xf7, 0xda, 0xd1, 0x56, 0xe3, 0x34, - 0xaa, 0xc8, 0x5f, 0x42, 0x19, 0x47, 0xe8, 0x52, 0x6e, 0xb3, 0x7a, 0x72, 0x90, 0xcc, 0x99, 0xd4, - 0x09, 0x4e, 0x19, 0x5a, 0x17, 0x4a, 0xcd, 0x2f, 0xa0, 0xc2, 0xd7, 0x6d, 0x23, 0x44, 0xf2, 0x01, - 0x14, 0x65, 0x5d, 0xd7, 0xda, 0xab, 0xef, 0xee, 0x76, 0x8a, 0xe7, 0x1d, 0xbd, 0xe8, 0xd8, 0xe4, - 0x29, 0x80, 0x6f, 0x04, 0xe8, 0xd2, 0xae, 0x63, 0x8b, 0x82, 0xae, 0xb5, 0xeb, 0xef, 0xee, 0x76, - 0x2a, 0x97, 0x7c, 0xf7, 0xbc, 0x13, 0xea, 0x15, 0x01, 0x38, 0xb7, 0xc3, 0xe6, 0xbf, 0x0a, 0xb0, - 0x21, 0x8c, 0x2a, 0x6b, 0xe4, 0x17, 0x00, 0xdc, 0x5e, 0xd7, 0x34, 0x42, 0x94, 0x9e, 0xfe, 0x24, - 0xe9, 0xa9, 0x72, 0x44, 0xaf, 0xa0, 0xf2, 0x29, 0x15, 0xda, 0x62, 0x3a, 0xb4, 0xc7, 0xb0, 0x29, - 0x30, 0xb7, 0x3c, 0x21, 0x15, 0x54, 0xc4, 0xf4, 0x7d, 0x2e, 0x13, 0xb9, 0x9a, 0x54, 0xb0, 0x71, - 0xe4, 0x58, 0xa8, 0x14, 0x56, 0x26, 0x14, 0x3a, 0x5c, 0x24, 0x15, 0x0e, 0x60, 0xc3, 0xb0, 0x2c, - 0x6f, 0xe8, 0x52, 0x85, 0x2d, 0x73, 0x6c, 0x5d, 0x6e, 0x0b, 0x5c, 0xf3, 0xae, 0x00, 0x1f, 0x64, - 0x07, 0x9c, 0x5c, 0x80, 0xe0, 0xed, 0x86, 0x6c, 0xaf, 0x3b, 0x79, 0x67, 0x3b, 0xd9, 0x77, 0x16, - 0x5f, 0xd6, 0x46, 0x3f, 0x11, 0xcf, 0xcf, 0xa1, 0x16, 0x0a, 0x0b, 0x5d, 0x3a, 0xf6, 0x45, 0x4e, - 0xad, 0x9f, 0x3c, 0x9d, 0x7b, 0xf7, 0xf2, 0xfb, 0xd7, 0x63, 0x1f, 0xf5, 0x6a, 0x18, 0x2f, 0xa2, - 0xe2, 0x28, 0x65, 0x14, 0xc7, 0xca, 0x44, 0x71, 0x34, 0x6d, 0xd0, 0xce, 0x44, 0x38, 0xc3, 0xd0, - 0xe8, 0xe3, 0x15, 0xba, 0x76, 0xe3, 0x6c, 0xb9, 0x42, 0xd8, 0x82, 0x35, 0xdf, 0x18, 0x0f, 0x3c, - 0xc3, 0x96, 0x77, 0x19, 0x2d, 0xe3, 0xca, 0x7b, 0x0d, 0x3f, 0x7d, 0x21, 0xe2, 0xfa, 0xc2, 0xf7, - 0xd1, 0xb5, 0x5f, 0xf8, 0xfe, 0x95, 0x8f, 0x96, 0xd3, 0x73, 0x2c, 0x7e, 0xfe, 0xc6, 0x7e, 0x6c, - 0x72, 0x82, 0xae, 0x90, 0x43, 0xf7, 0x8f, 0x82, 0x6c, 0x5d, 0x91, 0xd7, 0xff, 0x97, 0x35, 0x1c, - 0x39, 0x9f, 0xaa, 0xe1, 0xef, 0x64, 0xce, 0xa5, 0x00, 0x3f, 0x6c, 0xce, 0xe5, 0xde, 0x5b, 0xf3, - 0xef, 0x05, 0xd9, 0xa1, 0x45, 0x91, 0xfd, 0xaf, 0x84, 0xb7, 0x13, 0x85, 0xf7, 0xd3, 0xe9, 0xf0, - 0x3e, 0xce, 0x09, 0x2f, 0xf7, 0x3d, 0x15, 0x5d, 0x5b, 0xe5, 0xce, 0xb4, 0xfc, 0x07, 0x0d, 0x6e, - 0x73, 0x0f, 0xaa, 0x1c, 0xf3, 0x32, 0x40, 0x83, 0xe2, 0xe4, 0xec, 0xa5, 0xb2, 0xf8, 0x0b, 0xa8, - 0x70, 0xc8, 0x67, 0x9e, 0xe3, 0x36, 0x3e, 0x8d, 0x23, 0xbb, 0x0d, 0x95, 0x00, 0x7b, 0x18, 0x20, - 0x8b, 0x9c, 0x88, 0x6a, 0xbc, 0x41, 0x08, 0xac, 0xdc, 0x22, 0x35, 0x64, 0x48, 0xf9, 0x77, 0x4c, - 0xd9, 0x01, 0xe0, 0x94, 0xaf, 0xd0, 0x18, 0x61, 0xe3, 0xd9, 0x52, 0xb7, 0x15, 0xb3, 0x58, 0xd2, - 0xf7, 0x73, 0x77, 0xe4, 0xd0, 0xa5, 0x69, 0x1e, 0x47, 0xb7, 0x34, 0xf3, 0x1c, 0xcd, 0x5d, 0x00, - 0xd9, 0x91, 0x0d, 0x27, 0xc8, 0x8c, 0xcf, 0x05, 0xfc, 0xf8, 0xa5, 0xe7, 0x52, 0xc3, 0xa2, 0x52, - 0xa4, 0x47, 0xca, 0x93, 0xf0, 0x05, 0xcd, 0x3d, 0x81, 0x87, 0xd3, 0x64, 0x72, 0x32, 0xca, 0xb4, - 0x7c, 0x04, 0x9b, 0xd3, 0x60, 0x31, 0x53, 0x2d, 0xea, 0x65, 0x88, 0xf4, 0x95, 0xe3, 0xde, 0xfc, - 0x07, 0x5e, 0xfe, 0x2e, 0xe9, 0xe5, 0xa9, 0xfb, 0xcd, 0x10, 0x87, 0xb8, 0x7c, 0x7a, 0x94, 0xb2, - 0xd2, 0x43, 0x4f, 0x9e, 0xeb, 0x85, 0x65, 0xa1, 0x4f, 0x1b, 0x1f, 0xc6, 0xec, 0x07, 0xb0, 0x61, - 0x09, 0x48, 0xe2, 0x8e, 0xeb, 0x72, 0x3b, 0x99, 0x2c, 0x17, 0x50, 0x57, 0x9c, 0xb7, 0xde, 0x08, - 0xef, 0x45, 0xf6, 0x19, 0xd4, 0x24, 0x59, 0x7b, 0xe0, 0x59, 0x37, 0xf7, 0xe2, 0x7a, 0x05, 0xeb, - 0x92, 0xeb, 0xda, 0x35, 0xef, 0xcd, 0xf6, 0xd7, 0x02, 0x68, 0xf2, 0x4f, 0x58, 0xdc, 0x0e, 0xdf, - 0xc4, 0x84, 0xaa, 0xd5, 0x15, 0x32, 0x5b, 0x5d, 0x71, 0x56, 0xab, 0x2b, 0xa5, 0x5b, 0xdd, 0xaf, - 0xa2, 0x7c, 0xf9, 0x64, 0xba, 0xd5, 0xed, 0x25, 0x1b, 0x51, 0xe4, 0x53, 0xaa, 0xcd, 0xfd, 0x01, - 0xde, 0x4f, 0xc9, 0xc8, 0x27, 0xb0, 0x15, 0x0e, 0xcd, 0xaf, 0x51, 0x1c, 0x7b, 0xe0, 0x58, 0xec, - 0xe4, 0x5d, 0x73, 0x4c, 0x31, 0x94, 0x8e, 0x3f, 0x94, 0xf2, 0x4b, 0x2e, 0xbe, 0xc0, 0x71, 0x9b, - 0x09, 0x59, 0x5a, 0xf1, 0x1f, 0x9d, 0xb2, 0xeb, 0xb0, 0xef, 0xa3, 0xef, 0x57, 0x54, 0x48, 0x38, - 0x3b, 0x9f, 0x3b, 0x7e, 0x06, 0x8d, 0xe4, 0x5e, 0xf7, 0xda, 0xb5, 0xb1, 0xe7, 0xb8, 0x68, 0x6b, - 0xef, 0x91, 0x5d, 0xd8, 0x4e, 0xc9, 0x55, 0x17, 0xe4, 0xbf, 0x5a, 0xb2, 0x18, 0x64, 0x53, 0xeb, - 0x51, 0xad, 0x48, 0xf6, 0xd4, 0x2c, 0x11, 0xcb, 0xe3, 0x4e, 0x82, 0xb6, 0x56, 0x22, 0x4f, 0xe0, - 0xe7, 0x29, 0x48, 0x66, 0xf5, 0xdb, 0xda, 0x0a, 0x39, 0x82, 0x83, 0x39, 0xe0, 0xe8, 0x17, 0x55, - 0x99, 0x7c, 0x08, 0xcf, 0xe6, 0x60, 0x55, 0x8f, 0xe2, 0x6d, 0x40, 0x5b, 0x5d, 0xc0, 0x17, 0x59, - 0xe3, 0xb6, 0xb6, 0x46, 0x1e, 0xc3, 0xde, 0x1c, 0x30, 0xda, 0xda, 0x03, 0xf2, 0x08, 0x76, 0xf3, - 0x60, 0xa2, 0xa2, 0xd1, 0xd6, 0x2a, 0x64, 0x1f, 0x76, 0xf2, 0xc9, 0x58, 0xa9, 0xda, 0x1a, 0xcc, - 0x02, 0xf1, 0x12, 0x44, 0x5b, 0xab, 0xce, 0x72, 0x4b, 0xd6, 0x16, 0xda, 0x5a, 0x2d, 0xf3, 0x66, - 0xe2, 0x49, 0x0f, 0x6d, 0xad, 0x7e, 0xd4, 0x86, 0xed, 0x59, 0x33, 0xec, 0xf4, 0x8f, 0xd9, 0x0a, - 0x94, 0x39, 0x58, 0x2b, 0x10, 0x80, 0x55, 0xf1, 0xf7, 0x5a, 0x2b, 0x9e, 0x7c, 0xbf, 0x09, 0x1b, - 0x97, 0x32, 0xff, 0xaf, 0x30, 0x60, 0x37, 0x4f, 0xbe, 0xce, 0x7a, 0x47, 0x21, 0x47, 0x79, 0xbf, - 0xb7, 0x63, 0x4c, 0x2b, 0xea, 0xd0, 0x87, 0x0b, 0x61, 0x59, 0x49, 0x7e, 0x9b, 0xff, 0xc6, 0x42, - 0x9e, 0x2f, 0xfc, 0x0b, 0x3f, 0xb2, 0xdb, 0x5a, 0x42, 0x83, 0x59, 0xbf, 0x9e, 0x1a, 0x2c, 0xc8, - 0x7e, 0xe6, 0x64, 0x22, 0x84, 0xca, 0xc6, 0xde, 0x6c, 0x10, 0xa3, 0xfd, 0x7c, 0x62, 0x18, 0x21, - 0xd9, 0x78, 0x26, 0x52, 0x94, 0x3b, 0xb3, 0x20, 0x8c, 0x50, 0x9f, 0x1c, 0x45, 0x48, 0x33, 0x13, - 0xce, 0x65, 0x8a, 0x72, 0x77, 0x26, 0x66, 0xf2, 0xec, 0x62, 0x30, 0xc9, 0x39, 0xbb, 0x10, 0xce, - 0x39, 0xbb, 0x02, 0x49, 0x57, 0xe3, 0x06, 0x92, 0x76, 0x35, 0x96, 0xe5, 0xbb, 0x3a, 0x85, 0x61, - 0x9c, 0xe3, 0xdc, 0xe1, 0x85, 0x1c, 0x27, 0x95, 0x73, 0x80, 0xca, 0xda, 0xb3, 0xc5, 0x15, 0x98, - 0xe9, 0x30, 0x67, 0xd4, 0x21, 0x73, 0x78, 0x24, 0x4c, 0x99, 0x7d, 0xb2, 0x28, 0x9c, 0x19, 0xf5, - 0xb3, 0x47, 0x26, 0xf2, 0x74, 0x36, 0x89, 0x40, 0x29, 0x93, 0x47, 0x0b, 0xa2, 0x99, 0xc5, 0x3f, - 0xc1, 0x76, 0xc6, 0xe0, 0xb5, 0x44, 0x98, 0xe5, 0x98, 0xb6, 0x78, 0x98, 0x63, 0x85, 0xcc, 0x30, - 0xcb, 0x3e, 0x3e, 0x2f, 0xcc, 0x12, 0xb6, 0x68, 0x98, 0x63, 0x78, 0x66, 0x98, 0x45, 0xbf, 0x9f, - 0x17, 0x66, 0x81, 0x5a, 0x34, 0xcc, 0x0a, 0xcd, 0x2c, 0xfe, 0x36, 0x31, 0xdf, 0x91, 0xc7, 0xb9, - 0xca, 0x4c, 0xac, 0x6c, 0xec, 0xcf, 0x83, 0x31, 0xf2, 0x37, 0xd3, 0xf3, 0x1e, 0x79, 0x94, 0xa3, - 0xc4, 0xa5, 0x8a, 0xba, 0x39, 0x07, 0xc5, 0x98, 0x7f, 0x9f, 0x9c, 0xfe, 0xc8, 0x41, 0x8e, 0x96, - 0x94, 0x2b, 0xf6, 0x47, 0x73, 0x71, 0xf2, 0x22, 0xb2, 0xde, 0x30, 0xc9, 0xec, 0x27, 0x1b, 0x89, - 0xca, 0xbf, 0x88, 0x1c, 0xb4, 0xcc, 0xb7, 0xcc, 0xe7, 0xda, 0x74, 0xbe, 0x65, 0xc2, 0xf2, 0xf3, - 0x2d, 0x0f, 0xce, 0x8c, 0x66, 0x3c, 0x0f, 0x91, 0xc3, 0x99, 0xaf, 0x19, 0xe8, 0xda, 0xca, 0xd4, - 0xc1, 0x02, 0x48, 0x66, 0xe5, 0xcf, 0x85, 0x39, 0xef, 0x43, 0xe4, 0xe3, 0x9c, 0xb9, 0x37, 0x1b, - 0xae, 0x1c, 0xf8, 0x68, 0x59, 0x35, 0xe6, 0x4d, 0x2f, 0x3d, 0xe9, 0xa7, 0xcf, 0x9c, 0x44, 0xe4, - 0x9f, 0x39, 0x03, 0xe9, 0x0f, 0xc6, 0xcf, 0x0b, 0xe4, 0xbb, 0xc4, 0x85, 0x2a, 0x63, 0x27, 0xf3, - 0x9f, 0xfd, 0x52, 0x66, 0x9f, 0x2f, 0xa5, 0x23, 0x1c, 0x18, 0xe6, 0xbc, 0xa2, 0xe5, 0x64, 0x54, - 0x12, 0x36, 0x27, 0xa3, 0x32, 0xe0, 0xc2, 0x6c, 0x90, 0xfd, 0xb8, 0x94, 0x53, 0x3a, 0x09, 0xd4, - 0x9c, 0xd2, 0x49, 0xa3, 0xb9, 0xcd, 0xf6, 0xde, 0x97, 0x3b, 0x02, 0x4e, 0xd1, 0xfa, 0xea, 0xb8, - 0xef, 0x1d, 0xfb, 0x37, 0xfd, 0xe3, 0xa9, 0xff, 0xe7, 0x99, 0xab, 0xfc, 0xeb, 0xa3, 0x7f, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x9a, 0xf4, 0x65, 0x40, 0xe7, 0x1b, 0x00, 0x00, + // 1743 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x5b, 0x6f, 0x1b, 0xd7, + 0x11, 0x0e, 0x49, 0x5d, 0xcc, 0x21, 0x25, 0x6d, 0x4e, 0xe5, 0x54, 0x25, 0xd4, 0x4a, 0xa2, 0x2c, + 0x45, 0x90, 0x6d, 0xd2, 0x51, 0x10, 0xa4, 0x40, 0xfa, 0x50, 0xd3, 0x14, 0x04, 0x45, 0x36, 0xa2, + 0xac, 0xaa, 0xc2, 0x48, 0xd1, 0xb2, 0x7b, 0x19, 0x32, 0x1b, 0x51, 0xbb, 0x9b, 0xdd, 0x43, 0xba, + 0x04, 0x82, 0xe6, 0x07, 0xf4, 0x9f, 0xf4, 0xa1, 0x40, 0x1e, 0xfb, 0x57, 0x8a, 0x42, 0x40, 0xfd, + 0x2f, 0xfa, 0x56, 0x9c, 0xcb, 0x9e, 0x25, 0xf7, 0xc2, 0x4b, 0xe5, 0x02, 0xcd, 0xdb, 0x9e, 0x33, + 0xdf, 0x7c, 0x33, 0x67, 0xce, 0xcc, 0x68, 0x78, 0x04, 0x3f, 0x31, 0x31, 0xa0, 0x23, 0x3f, 0xf0, + 0xa8, 0x67, 0x79, 0xfd, 0x06, 0xff, 0x20, 0xeb, 0x7c, 0xb3, 0x11, 0xed, 0xd6, 0x9e, 0xf6, 0x1c, + 0xfa, 0xf5, 0xc0, 0x6c, 0x58, 0xde, 0x6d, 0xb3, 0xe7, 0xf5, 0xbc, 0x26, 0x97, 0x98, 0x83, 0x2e, + 0x5f, 0xf1, 0x05, 0xff, 0x12, 0x1a, 0xf5, 0x57, 0x40, 0xce, 0xdd, 0x90, 0x1a, 0xae, 0x85, 0xa7, + 0x7f, 0xf2, 0xbd, 0x80, 0xb6, 0x0d, 0x6a, 0xd4, 0xca, 0xb0, 0xaa, 0xe3, 0xb7, 0x03, 0x0c, 0x69, + 0xed, 0x09, 0x2c, 0xeb, 0xe8, 0xf7, 0x47, 0x64, 0x1f, 0xd6, 0x90, 0x23, 0xd0, 0xee, 0xd8, 0x06, + 0x35, 0xb6, 0x0a, 0xbb, 0x85, 0xa3, 0xaa, 0x5e, 0x8d, 0x36, 0x99, 0x62, 0xfd, 0xaf, 0x4b, 0xb0, + 0x15, 0xf1, 0x9d, 0x21, 0x7d, 0xe1, 0xb9, 0x5d, 0xa7, 0x37, 0x08, 0x0c, 0xea, 0x78, 0xee, 0x38, + 0xeb, 0xdf, 0x4b, 0x31, 0xed, 0xaa, 0x8f, 0x18, 0x74, 0x1c, 0x9b, 0x13, 0x96, 0x5b, 0xf0, 0xf6, + 0x6e, 0x67, 0xe5, 0x12, 0x31, 0x38, 0x6f, 0xeb, 0x2b, 0x4c, 0x74, 0x6e, 0x93, 0x6d, 0x28, 0xf7, + 0x9d, 0x90, 0xa2, 0x8b, 0x41, 0xb8, 0x55, 0xdc, 0x2d, 0x1d, 0x95, 0xf5, 0x78, 0x83, 0xfc, 0x16, + 0x2a, 0x66, 0x1f, 0x3b, 0xe8, 0x1a, 0x66, 0x1f, 0xed, 0xad, 0xd2, 0x6e, 0xe1, 0x68, 0xfd, 0xe4, + 0x93, 0xc6, 0x64, 0x60, 0x1a, 0x79, 0x6e, 0x35, 0xae, 0x90, 0x52, 0xc7, 0xed, 0x5d, 0x51, 0x83, + 0xa2, 0x0e, 0x66, 0x1f, 0x4f, 0x05, 0x11, 0xe9, 0x80, 0xf6, 0xc6, 0xe9, 0x3a, 0x1d, 0xff, 0xc4, + 0x57, 0xe4, 0x4b, 0xf7, 0x21, 0x5f, 0x67, 0x74, 0x97, 0x27, 0x7e, 0x64, 0xe0, 0x35, 0x54, 0x6f, + 0x6d, 0x37, 0x54, 0xe4, 0xcb, 0xf7, 0x21, 0xaf, 0x30, 0xaa, 0x88, 0xf9, 0x2b, 0x58, 0x0b, 0xb0, + 0x6f, 0x8c, 0x14, 0xf5, 0xca, 0x7d, 0xa8, 0xab, 0x9c, 0x4b, 0x72, 0xd7, 0xcf, 0xa0, 0x3a, 0x2e, + 0x25, 0x15, 0x58, 0xbd, 0x76, 0x6f, 0x5c, 0xef, 0x8d, 0xab, 0xbd, 0xc7, 0x16, 0x12, 0xa7, 0x15, + 0x48, 0x15, 0x1e, 0xb4, 0x9d, 0x50, 0xac, 0x8a, 0x64, 0x03, 0x2a, 0xd7, 0xae, 0x31, 0x34, 0x9c, + 0x3e, 0xdb, 0xd1, 0x4a, 0xf5, 0x37, 0xf0, 0xf0, 0x2c, 0xf0, 0x06, 0x7e, 0xc4, 0x86, 0xf4, 0x15, + 0xde, 0x9a, 0x18, 0xd4, 0xae, 0x55, 0xa2, 0x90, 0x3a, 0xac, 0xf5, 0x18, 0xa6, 0xe3, 0x0f, 0xcc, + 0xce, 0x0d, 0x8e, 0x64, 0xd6, 0x55, 0xf8, 0xe6, 0xe5, 0xc0, 0xbc, 0xc0, 0x11, 0xd1, 0xa0, 0xc4, + 0x24, 0x45, 0x96, 0x3e, 0x3a, 0xfb, 0x24, 0x9b, 0xb0, 0x3c, 0x34, 0xfa, 0x03, 0xe4, 0xb9, 0x50, + 0xd5, 0xc5, 0xa2, 0xb6, 0x2a, 0x73, 0xae, 0x3e, 0x84, 0xcd, 0x84, 0x61, 0xbe, 0xfc, 0x9f, 0xdb, + 0xfd, 0x57, 0x01, 0x6a, 0x13, 0x86, 0xa9, 0x17, 0xe0, 0xd5, 0xc0, 0x0c, 0xad, 0xc0, 0x31, 0xb1, + 0xf6, 0xdd, 0x62, 0xe6, 0x37, 0x61, 0x39, 0x74, 0x5c, 0x0b, 0xb9, 0x03, 0x55, 0x5d, 0x2c, 0xd8, + 0xee, 0xc0, 0xa5, 0x4e, 0x3f, 0x72, 0x81, 0x2f, 0xc8, 0x1e, 0x54, 0x7b, 0x5e, 0xc7, 0x34, 0xac, + 0x9b, 0x37, 0x46, 0x60, 0x87, 0x3c, 0x8d, 0x1f, 0xe8, 0x95, 0x9e, 0xd7, 0x8a, 0xb6, 0x6a, 0xa7, + 0x51, 0x45, 0xfe, 0x0a, 0x96, 0x71, 0x88, 0x2e, 0xe5, 0x36, 0x2b, 0x27, 0x87, 0xc9, 0x9c, 0x49, + 0x9d, 0xe0, 0x94, 0xa1, 0x75, 0xa1, 0x54, 0xff, 0x12, 0xca, 0x7c, 0xdd, 0x32, 0x42, 0x24, 0x1f, + 0x40, 0x51, 0xd6, 0x75, 0xb5, 0xb5, 0xf2, 0xf6, 0x6e, 0xa7, 0x78, 0xde, 0xd6, 0x8b, 0x8e, 0x4d, + 0x9e, 0x00, 0xf8, 0x46, 0x80, 0x2e, 0xed, 0x38, 0xb6, 0x28, 0xe8, 0x6a, 0x6b, 0xed, 0xed, 0xdd, + 0x4e, 0xf9, 0x92, 0xef, 0x9e, 0xb7, 0x43, 0xbd, 0x2c, 0x00, 0xe7, 0x76, 0x58, 0xff, 0x77, 0x01, + 0x36, 0x84, 0x51, 0x65, 0x8d, 0xfc, 0x12, 0x80, 0xdb, 0xeb, 0x98, 0x46, 0x88, 0xd2, 0xd3, 0x9f, + 0x25, 0x3d, 0x55, 0x8e, 0xe8, 0x65, 0x54, 0x3e, 0xa5, 0x42, 0x5b, 0x4c, 0x87, 0xb6, 0x09, 0x9b, + 0x02, 0x73, 0xcb, 0x13, 0x52, 0x41, 0x45, 0x4c, 0xdf, 0xe7, 0x32, 0x91, 0xab, 0x49, 0x05, 0x1b, + 0x87, 0x8e, 0x85, 0x4a, 0x61, 0x69, 0x4c, 0xa1, 0xcd, 0x45, 0x52, 0xe1, 0x10, 0x36, 0x0c, 0xcb, + 0xf2, 0x06, 0x2e, 0x55, 0xd8, 0x65, 0x8e, 0x5d, 0x93, 0xdb, 0x02, 0x57, 0xbf, 0x2b, 0xc0, 0x07, + 0xd9, 0x01, 0x27, 0x17, 0x20, 0x78, 0x3b, 0x21, 0xdb, 0xeb, 0x8c, 0xdf, 0xd9, 0x4e, 0xf6, 0x9d, + 0xc5, 0x97, 0xb5, 0xd1, 0x4b, 0xc4, 0xf3, 0x0b, 0xa8, 0x86, 0xc2, 0x42, 0x87, 0x8e, 0x7c, 0x91, + 0x53, 0xeb, 0x27, 0x4f, 0x66, 0xde, 0xbd, 0xfc, 0xfe, 0xcd, 0xc8, 0x47, 0xbd, 0x12, 0xc6, 0x8b, + 0xa8, 0x38, 0x4a, 0x19, 0xc5, 0xb1, 0x34, 0x56, 0x1c, 0x75, 0x1b, 0xb4, 0x33, 0x11, 0xce, 0x30, + 0x34, 0x7a, 0x78, 0x85, 0xae, 0x5d, 0x3b, 0x5b, 0xac, 0x10, 0xb6, 0x60, 0xd5, 0x37, 0x46, 0x7d, + 0xcf, 0xb0, 0xe5, 0x5d, 0x46, 0xcb, 0xb8, 0xf2, 0x5e, 0xc1, 0xcf, 0x9f, 0x8b, 0xb8, 0x3e, 0xf7, + 0x7d, 0x74, 0xed, 0xe7, 0xbe, 0x7f, 0xe5, 0xa3, 0xe5, 0x74, 0x1d, 0x8b, 0x9f, 0xbf, 0xb6, 0x1f, + 0x9b, 0x1c, 0xa3, 0x2b, 0xe4, 0xd0, 0xfd, 0xb3, 0x20, 0x5b, 0x57, 0xe4, 0xf5, 0x8f, 0xb2, 0x86, + 0x23, 0xe7, 0x53, 0x35, 0xfc, 0xbd, 0xcc, 0xb9, 0x14, 0xe0, 0xdd, 0xe6, 0x5c, 0xee, 0xbd, 0xd5, + 0xff, 0x51, 0x90, 0x1d, 0x5a, 0x14, 0xd9, 0xff, 0x4b, 0x78, 0xdb, 0x51, 0x78, 0x3f, 0x9b, 0x0c, + 0xef, 0x41, 0x4e, 0x78, 0xb9, 0xef, 0xa9, 0xe8, 0xda, 0x2a, 0x77, 0x26, 0xe5, 0xef, 0x34, 0xb8, + 0xf5, 0x3d, 0xa8, 0x70, 0xcc, 0x8b, 0x00, 0x0d, 0x8a, 0xe3, 0xb3, 0x97, 0xca, 0xe2, 0x2f, 0xa1, + 0xcc, 0x21, 0x9f, 0x7b, 0x8e, 0x5b, 0xfb, 0x2c, 0x8e, 0xec, 0x36, 0x94, 0x03, 0xec, 0x62, 0x80, + 0x2c, 0x72, 0x22, 0xaa, 0xf1, 0x06, 0x21, 0xb0, 0x74, 0x8b, 0xd4, 0x90, 0x21, 0xe5, 0xdf, 0x31, + 0x65, 0x1b, 0x80, 0x53, 0xbe, 0x44, 0x63, 0x88, 0xb5, 0xa7, 0x0b, 0xdd, 0x56, 0xcc, 0x62, 0x49, + 0xdf, 0xcf, 0xdd, 0xa1, 0x43, 0x17, 0xa6, 0x39, 0x88, 0x6e, 0x69, 0xea, 0x39, 0xea, 0xbb, 0x00, + 0xb2, 0x23, 0x1b, 0x4e, 0x90, 0x19, 0x9f, 0x0b, 0xf8, 0xe9, 0x0b, 0xcf, 0xa5, 0x86, 0x45, 0xa5, + 0x48, 0x8f, 0x94, 0xc7, 0xe1, 0x73, 0x9a, 0x7b, 0x0c, 0x0f, 0x27, 0xc9, 0xe4, 0x64, 0x94, 0x69, + 0xf9, 0x18, 0x36, 0x27, 0xc1, 0x62, 0xa6, 0x9a, 0xd7, 0xcb, 0x10, 0xe9, 0x4b, 0xc7, 0xbd, 0xf9, + 0x2f, 0xbc, 0xfc, 0x7d, 0xd2, 0xcb, 0x53, 0xf7, 0xdb, 0x01, 0x0e, 0x70, 0xf1, 0xf4, 0x28, 0x65, + 0xa5, 0x87, 0x9e, 0x3c, 0xd7, 0x73, 0xcb, 0x42, 0x9f, 0xd6, 0x3e, 0x8a, 0xd9, 0x0f, 0x61, 0xc3, + 0x12, 0x90, 0xc4, 0x1d, 0xaf, 0xc9, 0xed, 0x64, 0xb2, 0x5c, 0xc0, 0x9a, 0xe2, 0xbc, 0xf5, 0x86, + 0x78, 0x2f, 0xb2, 0xcf, 0xa1, 0x2a, 0xc9, 0x5a, 0x7d, 0xcf, 0xba, 0xb9, 0x17, 0xd7, 0x4b, 0x58, + 0x97, 0x5c, 0xd7, 0xae, 0x79, 0x6f, 0xb6, 0xbf, 0x15, 0x40, 0x93, 0x7f, 0xc2, 0xe2, 0x76, 0xf8, + 0x3a, 0x26, 0x54, 0xad, 0xae, 0x90, 0xd9, 0xea, 0x8a, 0xd3, 0x5a, 0x5d, 0x29, 0xdd, 0xea, 0x7e, + 0x1d, 0xe5, 0xcb, 0xa7, 0x93, 0xad, 0x6e, 0x2f, 0xd9, 0x88, 0x22, 0x9f, 0x52, 0x6d, 0xee, 0x8f, + 0xf0, 0x7e, 0x4a, 0x46, 0x3e, 0x85, 0xad, 0x70, 0x60, 0x7e, 0x83, 0xe2, 0xd8, 0x7d, 0xc7, 0x62, + 0x27, 0xef, 0x98, 0x23, 0x8a, 0xa1, 0x74, 0xfc, 0xa1, 0x94, 0x5f, 0x72, 0xf1, 0x05, 0x8e, 0x5a, + 0x4c, 0xc8, 0xd2, 0x8a, 0xff, 0xe8, 0x94, 0x5d, 0x87, 0x7d, 0x1f, 0xff, 0xb0, 0xa4, 0x42, 0xc2, + 0xd9, 0xf9, 0xdc, 0xf1, 0x0b, 0xa8, 0x25, 0xf7, 0x3a, 0xd7, 0xae, 0x8d, 0x5d, 0xc7, 0x45, 0x5b, + 0x7b, 0x8f, 0xec, 0xc2, 0x76, 0x4a, 0xae, 0xba, 0x20, 0xff, 0xd5, 0x92, 0xc5, 0x20, 0x9b, 0x5a, + 0x97, 0x6a, 0x45, 0xb2, 0xa7, 0x66, 0x89, 0x58, 0x1e, 0x77, 0x12, 0xb4, 0xb5, 0x12, 0x79, 0x0c, + 0x1f, 0xa6, 0x20, 0x99, 0xd5, 0x6f, 0x6b, 0x4b, 0xe4, 0x18, 0x0e, 0x67, 0x80, 0xa3, 0x5f, 0x54, + 0xcb, 0xe4, 0x23, 0x78, 0x3a, 0x03, 0xab, 0x7a, 0x14, 0x6f, 0x03, 0xda, 0xca, 0x1c, 0xbe, 0xc8, + 0x1a, 0xb7, 0xb5, 0x55, 0x72, 0x00, 0x7b, 0x33, 0xc0, 0x68, 0x6b, 0x0f, 0xc8, 0x23, 0xd8, 0xcd, + 0x83, 0x89, 0x8a, 0x46, 0x5b, 0x2b, 0x93, 0x7d, 0xd8, 0xc9, 0x27, 0x63, 0xa5, 0x6a, 0x6b, 0x30, + 0x0d, 0xc4, 0x4b, 0x10, 0x6d, 0xad, 0x32, 0xcd, 0x2d, 0x59, 0x5b, 0x68, 0x6b, 0xd5, 0xcc, 0x9b, + 0x89, 0x27, 0x3d, 0xb4, 0xb5, 0xb5, 0xe3, 0x16, 0x6c, 0x4f, 0x9b, 0x61, 0x27, 0x7f, 0xcc, 0x96, + 0x61, 0x99, 0x83, 0xb5, 0x02, 0x01, 0x58, 0x11, 0x7f, 0xaf, 0xb5, 0xe2, 0xc9, 0x0f, 0x9b, 0xb0, + 0x71, 0x29, 0xf3, 0xff, 0x0a, 0x03, 0x76, 0xf3, 0xe4, 0x9b, 0xac, 0x77, 0x14, 0x72, 0x9c, 0xf7, + 0x7b, 0x3b, 0xc6, 0x34, 0xa2, 0x0e, 0x7d, 0x34, 0x17, 0x96, 0x95, 0xe4, 0x77, 0xf9, 0x6f, 0x2c, + 0xe4, 0xd9, 0xdc, 0xbf, 0xf0, 0x23, 0xbb, 0x8d, 0x05, 0x34, 0x98, 0xf5, 0xeb, 0x89, 0xc1, 0x82, + 0xec, 0x67, 0x4e, 0x26, 0x42, 0xa8, 0x6c, 0xec, 0x4d, 0x07, 0x31, 0xda, 0x2f, 0xc6, 0x86, 0x11, + 0x92, 0x8d, 0x67, 0x22, 0x45, 0xb9, 0x33, 0x0d, 0xc2, 0x08, 0xf5, 0xf1, 0x51, 0x84, 0xd4, 0x33, + 0xe1, 0x5c, 0xa6, 0x28, 0x77, 0xa7, 0x62, 0xc6, 0xcf, 0x2e, 0x06, 0x93, 0x9c, 0xb3, 0x0b, 0xe1, + 0x8c, 0xb3, 0x2b, 0x90, 0x74, 0x35, 0x6e, 0x20, 0x69, 0x57, 0x63, 0x59, 0xbe, 0xab, 0x13, 0x18, + 0xc6, 0x39, 0xca, 0x1d, 0x5e, 0x48, 0x33, 0xa9, 0x9c, 0x03, 0x54, 0xd6, 0x9e, 0xce, 0xaf, 0xc0, + 0x4c, 0x87, 0x39, 0xa3, 0x0e, 0x99, 0xc1, 0x23, 0x61, 0xca, 0xec, 0xe3, 0x79, 0xe1, 0xcc, 0xa8, + 0x9f, 0x3d, 0x32, 0x91, 0x27, 0xd3, 0x49, 0x04, 0x4a, 0x99, 0x3c, 0x9e, 0x13, 0xcd, 0x2c, 0xfe, + 0x19, 0xb6, 0x33, 0x06, 0xaf, 0x05, 0xc2, 0x2c, 0xc7, 0xb4, 0xf9, 0xc3, 0x1c, 0x2b, 0x64, 0x86, + 0x59, 0xf6, 0xf1, 0x59, 0x61, 0x96, 0xb0, 0x79, 0xc3, 0x1c, 0xc3, 0x33, 0xc3, 0x2c, 0xfa, 0xfd, + 0xac, 0x30, 0x0b, 0xd4, 0xbc, 0x61, 0x56, 0x68, 0x66, 0xf1, 0x77, 0x89, 0xf9, 0x8e, 0x1c, 0xe4, + 0x2a, 0x33, 0xb1, 0xb2, 0xb1, 0x3f, 0x0b, 0xc6, 0xc8, 0x5f, 0x4f, 0xce, 0x7b, 0xe4, 0x51, 0x8e, + 0x12, 0x97, 0x2a, 0xea, 0xfa, 0x0c, 0x14, 0x63, 0xfe, 0x43, 0x72, 0xfa, 0x23, 0x87, 0x39, 0x5a, + 0x52, 0xae, 0xd8, 0x1f, 0xcd, 0xc4, 0xc9, 0x8b, 0xc8, 0x7a, 0xc3, 0x24, 0xd3, 0x9f, 0x6c, 0x24, + 0x2a, 0xff, 0x22, 0x72, 0xd0, 0x32, 0xdf, 0x32, 0x9f, 0x6b, 0xd3, 0xf9, 0x96, 0x09, 0xcb, 0xcf, + 0xb7, 0x3c, 0x38, 0x33, 0x9a, 0xf1, 0x3c, 0x44, 0x8e, 0xa6, 0xbe, 0x66, 0xa0, 0x6b, 0x2b, 0x53, + 0x87, 0x73, 0x20, 0x99, 0x95, 0xbf, 0x14, 0x66, 0xbc, 0x0f, 0x91, 0x4f, 0x72, 0xe6, 0xde, 0x6c, + 0xb8, 0x72, 0xe0, 0xe3, 0x45, 0xd5, 0x98, 0x37, 0xdd, 0xf4, 0xa4, 0x9f, 0x3e, 0x73, 0x12, 0x91, + 0x7f, 0xe6, 0x0c, 0xa4, 0xdf, 0x1f, 0x3d, 0x2b, 0x90, 0xef, 0x13, 0x17, 0xaa, 0x8c, 0x9d, 0xcc, + 0x7e, 0xf6, 0x4b, 0x99, 0x7d, 0xb6, 0x90, 0x8e, 0x70, 0x60, 0x90, 0xf3, 0x8a, 0x96, 0x93, 0x51, + 0x49, 0xd8, 0x8c, 0x8c, 0xca, 0x80, 0x0b, 0xb3, 0x41, 0xf6, 0xe3, 0x52, 0x4e, 0xe9, 0x24, 0x50, + 0x33, 0x4a, 0x27, 0x8d, 0xe6, 0x36, 0x5b, 0x1f, 0x7e, 0x75, 0x20, 0xe0, 0x14, 0xad, 0xaf, 0x9b, + 0xfc, 0xb3, 0xd9, 0xf3, 0x9a, 0xfe, 0x4d, 0xaf, 0x39, 0xf1, 0x5f, 0x3d, 0x73, 0x85, 0x7f, 0x7d, + 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xd8, 0xf7, 0xe6, 0xed, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/pkg/bertyprotocol/client.go b/go/pkg/bertyprotocol/client.go index 7fb5c20e89..a45f37b65b 100644 --- a/go/pkg/bertyprotocol/client.go +++ b/go/pkg/bertyprotocol/client.go @@ -3,9 +3,9 @@ package bertyprotocol import ( "context" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/protocoldb" - "berty.tech/go/pkg/errcode" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/protocoldb" + "berty.tech/berty/go/pkg/errcode" ipfs_coreapi "github.com/ipfs/interface-go-ipfs-core" "github.com/jinzhu/gorm" "go.uber.org/zap" diff --git a/go/pkg/bertyprotocol/doc.go b/go/pkg/bertyprotocol/doc.go index a595d333d7..d8f90e5727 100644 --- a/go/pkg/bertyprotocol/doc.go +++ b/go/pkg/bertyprotocol/doc.go @@ -1 +1 @@ -package bertyprotocol // import "berty.tech/go/pkg/bertyprotocol" +package bertyprotocol // import "berty.tech/berty/go/pkg/bertyprotocol" diff --git a/go/pkg/bertyprotocol/testing.go b/go/pkg/bertyprotocol/testing.go index 636c2b6692..22d1882090 100644 --- a/go/pkg/bertyprotocol/testing.go +++ b/go/pkg/bertyprotocol/testing.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "berty.tech/go/internal/ipfsutil" - "berty.tech/go/internal/protocoldb" + "berty.tech/berty/go/internal/ipfsutil" + "berty.tech/berty/go/internal/protocoldb" "go.uber.org/zap" ) diff --git a/go/pkg/bertyprotocol/testing_test.go b/go/pkg/bertyprotocol/testing_test.go index 3388a7a251..76f1979210 100644 --- a/go/pkg/bertyprotocol/testing_test.go +++ b/go/pkg/bertyprotocol/testing_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "berty.tech/go/internal/testutil" + "berty.tech/berty/go/internal/testutil" "github.com/jinzhu/gorm" ) diff --git a/go/pkg/errcode/doc.go b/go/pkg/errcode/doc.go index acf0ccf0ea..3e4b0b84c3 100644 --- a/go/pkg/errcode/doc.go +++ b/go/pkg/errcode/doc.go @@ -1 +1 @@ -package errcode // import "berty.tech/go/pkg/errcode" +package errcode // import "berty.tech/berty/go/pkg/errcode" diff --git a/go/pkg/errcode/errcode.pb.go b/go/pkg/errcode/errcode.pb.go index 1a58b31849..e88def47ae 100644 --- a/go/pkg/errcode/errcode.pb.go +++ b/go/pkg/errcode/errcode.pb.go @@ -132,40 +132,40 @@ func init() { func init() { proto.RegisterFile("errcode.proto", fileDescriptor_4240057316120df7) } var fileDescriptor_4240057316120df7 = []byte{ - // 554 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcd, 0x4e, 0x14, 0x41, - 0x10, 0xc7, 0x39, 0x28, 0x2d, 0x6d, 0x08, 0x65, 0xa3, 0x22, 0x88, 0xe2, 0xd7, 0xc1, 0x98, 0xc8, - 0x1e, 0x7c, 0x02, 0x60, 0x17, 0xdd, 0x20, 0xbb, 0x84, 0x85, 0x98, 0x78, 0xeb, 0xdd, 0x2e, 0x66, - 0x3b, 0xcc, 0x54, 0x4f, 0x6a, 0x7a, 0x20, 0xe3, 0xc9, 0xab, 0xaf, 0xe0, 0xd3, 0xf8, 0x08, 0xea, - 0x1b, 0x78, 0x32, 0x7e, 0x7f, 0xeb, 0xc5, 0xaf, 0xcc, 0xec, 0x4c, 0x1c, 0x02, 0xde, 0xb6, 0xeb, - 0xff, 0xdb, 0x7f, 0xd7, 0x74, 0xfd, 0x4b, 0x4e, 0x22, 0xf3, 0xc0, 0x19, 0x5c, 0x8c, 0xd9, 0x79, - 0xa7, 0x26, 0xfb, 0xc8, 0x3e, 0x5b, 0x2c, 0x8b, 0x73, 0x37, 0x03, 0xeb, 0x87, 0x69, 0x7f, 0x71, - 0xe0, 0xa2, 0x46, 0xe0, 0x02, 0xd7, 0x28, 0xa8, 0x7e, 0xba, 0x53, 0x9c, 0x8a, 0x43, 0xf1, 0x6b, - 0xf4, 0xef, 0x1b, 0x4f, 0xc6, 0xa5, 0x68, 0x31, 0xaf, 0x38, 0x83, 0x6a, 0x52, 0x4e, 0x6c, 0x93, - 0xc1, 0x1d, 0x4b, 0x68, 0x60, 0x4c, 0x4d, 0xc8, 0x63, 0x5b, 0xdd, 0x66, 0x17, 0x1e, 0x1f, 0x57, - 0x67, 0xe5, 0xa9, 0x16, 0x73, 0xc7, 0xf9, 0x76, 0x14, 0x87, 0x18, 0x21, 0x79, 0x34, 0xf0, 0x68, - 0x5c, 0x81, 0x3c, 0xd9, 0x62, 0x6e, 0x93, 0x47, 0x26, 0x1d, 0xc2, 0x4b, 0xa1, 0xa6, 0xe5, 0x54, - 0x51, 0xd9, 0xd3, 0xa1, 0x35, 0x6d, 0x8a, 0x53, 0x0f, 0x58, 0x16, 0xd7, 0x6d, 0x92, 0x58, 0x0a, - 0x46, 0xc5, 0x1d, 0x35, 0x2b, 0x4f, 0xb7, 0x98, 0x7b, 0x36, 0x58, 0x19, 0x6a, 0x4b, 0x1d, 0xd7, - 0x22, 0xcf, 0x16, 0x13, 0x78, 0x25, 0xd4, 0x25, 0x79, 0xbe, 0x26, 0x95, 0x66, 0xb9, 0x9e, 0x6d, - 0x65, 0x31, 0xc2, 0x6b, 0xa1, 0xae, 0xc8, 0x0b, 0x35, 0x62, 0x29, 0x64, 0xd4, 0x26, 0x6b, 0x93, - 0xf5, 0x56, 0x87, 0xf6, 0x01, 0x1a, 0x78, 0x23, 0xd4, 0x9c, 0x3c, 0x53, 0x63, 0x36, 0x90, 0xa3, - 0xbc, 0x01, 0x47, 0xf0, 0x56, 0xa8, 0x6b, 0x72, 0xa1, 0xa6, 0x75, 0x63, 0x64, 0xed, 0xad, 0xab, - 0x8c, 0x9a, 0x8e, 0x10, 0xde, 0x55, 0x0e, 0x77, 0x34, 0x99, 0x64, 0xa8, 0x77, 0xb1, 0xe3, 0x36, - 0x74, 0x16, 0x3a, 0x6d, 0xe0, 0xbd, 0x50, 0xf3, 0x72, 0xa6, 0xae, 0x95, 0x4d, 0xae, 0x86, 0x6e, - 0x1f, 0x3e, 0x08, 0x75, 0x5d, 0x5e, 0xfd, 0x8f, 0xda, 0xf3, 0x18, 0x77, 0x9c, 0x5f, 0x75, 0x29, - 0x19, 0xf8, 0x28, 0xd4, 0x8c, 0x54, 0x75, 0x72, 0x43, 0xb3, 0x8e, 0x12, 0xf8, 0x24, 0xd4, 0x82, - 0x9c, 0x3b, 0x78, 0xf9, 0x52, 0xea, 0x87, 0x9b, 0xe8, 0x53, 0xce, 0xc7, 0xf3, 0xf9, 0x10, 0x50, - 0xde, 0xb1, 0x86, 0xa3, 0x47, 0xfa, 0x22, 0xd4, 0x65, 0x39, 0x7f, 0x04, 0xd0, 0xb3, 0x01, 0x69, - 0x9f, 0x32, 0xc2, 0xd7, 0x43, 0x1e, 0x3d, 0x2c, 0x5e, 0xa8, 0x24, 0xe1, 0xdb, 0x21, 0x8f, 0x35, - 0xcc, 0xf2, 0x14, 0x50, 0xf5, 0x72, 0xf0, 0x5d, 0xa8, 0x73, 0x72, 0xba, 0x8e, 0x34, 0x71, 0xc0, - 0x59, 0xec, 0xe1, 0x47, 0xe5, 0x7e, 0x9b, 0x5d, 0x1a, 0xaf, 0x63, 0xd4, 0x47, 0xbe, 0xeb, 0x82, - 0xd6, 0x1e, 0x92, 0xef, 0xc6, 0x48, 0xf0, 0xb3, 0x1a, 0xc3, 0x11, 0xc0, 0xbf, 0x26, 0x7f, 0x55, - 0xc3, 0x3e, 0x48, 0xdd, 0x63, 0x97, 0x47, 0x69, 0xcf, 0x7a, 0x64, 0xf8, 0x5d, 0xf5, 0x59, 0x63, - 0xb6, 0x69, 0x97, 0xdc, 0x3e, 0x15, 0x95, 0x76, 0x13, 0xfe, 0x1c, 0x81, 0x94, 0x81, 0xec, 0xe1, - 0x80, 0xd1, 0x27, 0xf0, 0xf0, 0x44, 0x99, 0xc9, 0x65, 0xb6, 0x26, 0xc0, 0x22, 0xd5, 0x9c, 0xc6, - 0x79, 0xd4, 0x9f, 0x4d, 0x95, 0x5f, 0x39, 0x92, 0x3a, 0xce, 0x6f, 0xa6, 0x44, 0x96, 0x02, 0x78, - 0x3e, 0xb5, 0xbc, 0xf0, 0xf4, 0xc5, 0xc5, 0xb1, 0xfb, 0xb3, 0xa3, 0x35, 0xf4, 0x38, 0x18, 0x36, - 0xf2, 0xad, 0xdb, 0x0d, 0x1a, 0xe5, 0x4a, 0xf6, 0xc7, 0x8b, 0x55, 0xbb, 0xf5, 0x37, 0x00, 0x00, - 0xff, 0xff, 0x53, 0xa3, 0xe8, 0xe6, 0xb9, 0x03, 0x00, 0x00, + // 557 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcb, 0x4e, 0x14, 0x41, + 0x14, 0x86, 0x59, 0x28, 0x25, 0x65, 0x08, 0xc7, 0x42, 0x45, 0x11, 0xc5, 0x6b, 0x62, 0x4c, 0x64, + 0x16, 0x3e, 0x01, 0x30, 0x83, 0x4e, 0x90, 0x19, 0xc2, 0x40, 0x4c, 0xdc, 0xd5, 0x4c, 0x1d, 0x7a, + 0x2a, 0x74, 0x9f, 0xea, 0x9c, 0xae, 0x86, 0xb4, 0x2b, 0xb7, 0xbe, 0x82, 0x4f, 0xe3, 0x23, 0xa8, + 0x6f, 0xe0, 0xca, 0x78, 0xbf, 0xeb, 0xc6, 0x5b, 0xba, 0xa7, 0x3b, 0x36, 0x01, 0x77, 0x55, 0xe7, + 0xff, 0xfa, 0xaf, 0xd3, 0x55, 0xff, 0x91, 0x93, 0xc8, 0x3c, 0x70, 0x06, 0x17, 0x62, 0x76, 0xde, + 0xa9, 0xc9, 0x3e, 0xb2, 0xcf, 0x16, 0xca, 0xe2, 0xec, 0xcd, 0xc0, 0xfa, 0x61, 0xda, 0x5f, 0x18, + 0xb8, 0xa8, 0x11, 0xb8, 0xc0, 0x35, 0x0a, 0xaa, 0x9f, 0x6e, 0x17, 0xbb, 0x62, 0x53, 0xac, 0x46, + 0x5f, 0xdf, 0x78, 0x32, 0x2e, 0x45, 0x8b, 0x79, 0xd9, 0x19, 0x54, 0x93, 0x72, 0x62, 0x8b, 0x0c, + 0x6e, 0x5b, 0x42, 0x03, 0x63, 0x6a, 0x42, 0x1e, 0xd9, 0xec, 0x36, 0xbb, 0xf0, 0xf8, 0xa8, 0x3a, + 0x2d, 0x4f, 0xb4, 0x98, 0x3b, 0xce, 0xb7, 0xa3, 0x38, 0xc4, 0x08, 0xc9, 0xa3, 0x81, 0x47, 0xe3, + 0x0a, 0xe4, 0xf1, 0x16, 0x73, 0x9b, 0x3c, 0x32, 0xe9, 0x10, 0x5e, 0x0a, 0x35, 0x2d, 0xa7, 0x8a, + 0xca, 0xae, 0x0e, 0xad, 0x69, 0x53, 0x9c, 0x7a, 0xc0, 0xb2, 0xb8, 0x66, 0x93, 0xc4, 0x52, 0x30, + 0x2a, 0x6e, 0xab, 0xb3, 0xf2, 0x64, 0x8b, 0xb9, 0x67, 0x83, 0xe5, 0xa1, 0xb6, 0xd4, 0x71, 0x2d, + 0xf2, 0x6c, 0x31, 0x81, 0x57, 0x42, 0x5d, 0x94, 0xe7, 0x6a, 0x52, 0x69, 0x96, 0xeb, 0xd9, 0x66, + 0x16, 0x23, 0xbc, 0x16, 0xea, 0xb2, 0x3c, 0x5f, 0x23, 0x16, 0x43, 0x46, 0x6d, 0xb2, 0x36, 0x59, + 0x6f, 0x75, 0x68, 0x1f, 0xa0, 0x81, 0x37, 0x42, 0xcd, 0xca, 0x53, 0x35, 0x66, 0x1d, 0x39, 0xca, + 0x1b, 0x70, 0x04, 0x6f, 0x85, 0xba, 0x2a, 0xe7, 0x6b, 0x5a, 0x37, 0x46, 0xd6, 0xde, 0xba, 0xca, + 0xa8, 0xe9, 0x08, 0xe1, 0x5d, 0xe5, 0x70, 0x47, 0x93, 0x49, 0x86, 0x7a, 0x07, 0x3b, 0x6e, 0x5d, + 0x67, 0xa1, 0xd3, 0x06, 0xde, 0x0b, 0x35, 0x27, 0x67, 0xea, 0x5a, 0xd9, 0xe4, 0x4a, 0xe8, 0xf6, + 0xe0, 0x83, 0x50, 0xd7, 0xe5, 0x95, 0xff, 0xa8, 0x3d, 0x8f, 0x71, 0xc7, 0xf9, 0x15, 0x97, 0x92, + 0x81, 0x8f, 0x42, 0xcd, 0x48, 0x55, 0x27, 0xd7, 0x35, 0xeb, 0x28, 0x81, 0x4f, 0x42, 0xcd, 0xcb, + 0xd9, 0xfd, 0x87, 0x2f, 0xa6, 0x7e, 0xb8, 0x81, 0x3e, 0xe5, 0xfc, 0x79, 0x3e, 0x1f, 0x00, 0xca, + 0x33, 0x56, 0x71, 0x74, 0x49, 0x5f, 0x84, 0xba, 0x24, 0xe7, 0x0e, 0x01, 0x7a, 0x36, 0x20, 0xed, + 0x53, 0x46, 0xf8, 0x7a, 0xc0, 0xa3, 0x87, 0xc5, 0x0d, 0x95, 0x24, 0x7c, 0x3b, 0xe0, 0xb1, 0x8a, + 0x59, 0x9e, 0x02, 0xaa, 0x6e, 0x0e, 0xbe, 0x0b, 0x75, 0x46, 0x4e, 0xd7, 0x91, 0x26, 0x0e, 0x38, + 0x8b, 0x3d, 0xfc, 0xa8, 0xdc, 0x6f, 0xb3, 0x4b, 0xe3, 0x35, 0x8c, 0xfa, 0xc8, 0x77, 0x5d, 0xd0, + 0xda, 0x45, 0xf2, 0xdd, 0x18, 0x09, 0x7e, 0x56, 0xcf, 0x70, 0x08, 0xf0, 0xaf, 0xc9, 0x5f, 0xd5, + 0x63, 0xef, 0xa7, 0xee, 0xb1, 0xcb, 0xa3, 0xb4, 0x6b, 0x3d, 0x32, 0xfc, 0xae, 0xfa, 0xac, 0x31, + 0x5b, 0xb4, 0x43, 0x6e, 0x8f, 0x8a, 0x4a, 0xbb, 0x09, 0x7f, 0x0e, 0x41, 0xca, 0x40, 0xf6, 0x70, + 0xc0, 0xe8, 0x13, 0x78, 0x78, 0xac, 0xcc, 0xe4, 0x12, 0x5b, 0x13, 0x60, 0x91, 0x6a, 0x4e, 0xe3, + 0x3c, 0xea, 0xcf, 0xa6, 0xca, 0xbf, 0x1c, 0x49, 0x1d, 0xe7, 0x37, 0x52, 0x22, 0x4b, 0x01, 0x3c, + 0x9f, 0x5a, 0xba, 0xf6, 0xf4, 0xc5, 0x85, 0xb1, 0xfb, 0xf3, 0xa3, 0x31, 0xf4, 0x38, 0x18, 0x36, + 0x8a, 0x65, 0x23, 0x9f, 0xbd, 0x9d, 0xa0, 0x51, 0x0e, 0x66, 0x7f, 0xbc, 0x18, 0xb8, 0x5b, 0x7f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xeb, 0x44, 0x6b, 0xbf, 0x03, 0x00, 0x00, } diff --git a/js/packages/react-native-chat-sdk/Makefile b/js/packages/react-native-chat-sdk/Makefile index 5fca8b254e..a3d567e2f7 100644 --- a/js/packages/react-native-chat-sdk/Makefile +++ b/js/packages/react-native-chat-sdk/Makefile @@ -12,10 +12,10 @@ AAR := $(PWD)/android/libs/Bridgechat.aar build.sdk: build.sdk.ios build.sdk.android build.sdk.ios: - gomobile bind -o $(FRAMEWORK) -v -target ios berty.tech/go/framework/bpbridge + gomobile bind -o $(FRAMEWORK) -v -target ios berty.tech/berty/go/framework/bpbridge build.sdk.android: - gomobile bind -o $(AAR) -v -target android berty.tech/go/framework/bpbridge + gomobile bind -o $(AAR) -v -target android berty.tech/berty/go/framework/bpbridge bazel.build.sdk: bazel.build.sdk.ios bazel.build.sdk.android diff --git a/test/experiment/BUILD.bazel b/test/experiment/BUILD.bazel index 21491a997e..2af718c5a5 100644 --- a/test/experiment/BUILD.bazel +++ b/test/experiment/BUILD.bazel @@ -1,3 +1,3 @@ -# gazelle:prefix berty.tech/experiment +# gazelle:prefix berty.tech/berty/experiment # gazelle:proto package # gazelle:proto_group go_package diff --git a/test/experiment/dht/BUILD.bazel b/test/experiment/dht/BUILD.bazel index 8844d8cb51..796388e0fe 100644 --- a/test/experiment/dht/BUILD.bazel +++ b/test/experiment/dht/BUILD.bazel @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht", + importpath = "berty.tech/berty/experiment/dht", visibility = ["//visibility:public"], ) diff --git a/test/experiment/dht/src/bittorrent/BUILD.bazel b/test/experiment/dht/src/bittorrent/BUILD.bazel index 0a52917ea8..09a55d2c70 100644 --- a/test/experiment/dht/src/bittorrent/BUILD.bazel +++ b/test/experiment/dht/src/bittorrent/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht/src/bittorrent", + importpath = "berty.tech/berty/experiment/dht/src/bittorrent", visibility = ["//visibility:public"], deps = ["//dht:go_default_library"], ) diff --git a/test/experiment/dht/src/bittorrent/dht.go b/test/experiment/dht/src/bittorrent/dht.go index a83532a4e2..4ae2bc669d 100644 --- a/test/experiment/dht/src/bittorrent/dht.go +++ b/test/experiment/dht/src/bittorrent/dht.go @@ -3,7 +3,7 @@ package bittorrent import ( "errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" ) var _ dht.DHT = (*DHT)(nil) diff --git a/test/experiment/dht/src/chord/BUILD.bazel b/test/experiment/dht/src/chord/BUILD.bazel index 660a6c86fc..9d713c273a 100644 --- a/test/experiment/dht/src/chord/BUILD.bazel +++ b/test/experiment/dht/src/chord/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht/src/chord", + importpath = "berty.tech/berty/experiment/dht/src/chord", visibility = ["//visibility:public"], deps = ["//dht:go_default_library"], ) diff --git a/test/experiment/dht/src/chord/dht.go b/test/experiment/dht/src/chord/dht.go index 46a789a096..75e1a0a174 100644 --- a/test/experiment/dht/src/chord/dht.go +++ b/test/experiment/dht/src/chord/dht.go @@ -3,7 +3,7 @@ package chord import ( "errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" ) var _ dht.DHT = (*DHT)(nil) diff --git a/test/experiment/dht/src/gnunet/BUILD.bazel b/test/experiment/dht/src/gnunet/BUILD.bazel index f8bbb8cd2c..ac6cf946a1 100644 --- a/test/experiment/dht/src/gnunet/BUILD.bazel +++ b/test/experiment/dht/src/gnunet/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht/src/gnunet", + importpath = "berty.tech/berty/experiment/dht/src/gnunet", visibility = ["//visibility:public"], deps = ["//dht:go_default_library"], ) diff --git a/test/experiment/dht/src/gnunet/dht.go b/test/experiment/dht/src/gnunet/dht.go index 9950ad9673..288b111566 100644 --- a/test/experiment/dht/src/gnunet/dht.go +++ b/test/experiment/dht/src/gnunet/dht.go @@ -3,7 +3,7 @@ package gnunet import ( "errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" ) var _ dht.DHT = (*DHT)(nil) diff --git a/test/experiment/dht/src/libp2p/BUILD.bazel b/test/experiment/dht/src/libp2p/BUILD.bazel index 9307512fc3..f187b09a64 100644 --- a/test/experiment/dht/src/libp2p/BUILD.bazel +++ b/test/experiment/dht/src/libp2p/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht/src/libp2p", + importpath = "berty.tech/berty/experiment/dht/src/libp2p", visibility = ["//visibility:public"], deps = ["//dht:go_default_library"], ) diff --git a/test/experiment/dht/src/libp2p/dht.go b/test/experiment/dht/src/libp2p/dht.go index 1c8f83a452..774a2e28dc 100644 --- a/test/experiment/dht/src/libp2p/dht.go +++ b/test/experiment/dht/src/libp2p/dht.go @@ -3,7 +3,7 @@ package libp2p import ( "errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" ) var _ dht.DHT = (*DHT)(nil) diff --git a/test/experiment/dht/src/matrix/BUILD.bazel b/test/experiment/dht/src/matrix/BUILD.bazel index 5a7b390004..9f9d532bd9 100644 --- a/test/experiment/dht/src/matrix/BUILD.bazel +++ b/test/experiment/dht/src/matrix/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "client.go", "dht.go", ], - importpath = "berty.tech/experiment/dht/src/matrix", + importpath = "berty.tech/berty/experiment/dht/src/matrix", visibility = ["//visibility:public"], deps = [ "//dht:go_default_library", diff --git a/test/experiment/dht/src/matrix/dht.go b/test/experiment/dht/src/matrix/dht.go index 251eb966e2..9fe509406d 100644 --- a/test/experiment/dht/src/matrix/dht.go +++ b/test/experiment/dht/src/matrix/dht.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" "github.com/matrix-org/gomatrix" ) diff --git a/test/experiment/dht/src/opendht/BUILD.bazel b/test/experiment/dht/src/opendht/BUILD.bazel index b18f033cbe..9d945a2bbe 100644 --- a/test/experiment/dht/src/opendht/BUILD.bazel +++ b/test/experiment/dht/src/opendht/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["dht.go"], - importpath = "berty.tech/experiment/dht/src/opendht", + importpath = "berty.tech/berty/experiment/dht/src/opendht", visibility = ["//visibility:public"], deps = ["//dht:go_default_library"], ) diff --git a/test/experiment/dht/src/opendht/dht.go b/test/experiment/dht/src/opendht/dht.go index 6cc70f0215..8057ffa409 100644 --- a/test/experiment/dht/src/opendht/dht.go +++ b/test/experiment/dht/src/opendht/dht.go @@ -3,7 +3,7 @@ package opendht import ( "errors" - "berty.tech/experiment/dht" + "berty.tech/berty/experiment/dht" ) var _ dht.DHT = (*DHT)(nil) diff --git a/test/experiment/dht/test/basic_test.go b/test/experiment/dht/test/basic_test.go index ca91cf8153..dedf70fda0 100644 --- a/test/experiment/dht/test/basic_test.go +++ b/test/experiment/dht/test/basic_test.go @@ -3,12 +3,12 @@ package test import ( "testing" - "berty.tech/experiment/dht" - "berty.tech/experiment/dht/src/bittorrent" - "berty.tech/experiment/dht/src/chord" - "berty.tech/experiment/dht/src/gnunet" - "berty.tech/experiment/dht/src/libp2p" - "berty.tech/experiment/dht/src/matrix" + "berty.tech/berty/experiment/dht" + "berty.tech/berty/experiment/dht/src/bittorrent" + "berty.tech/berty/experiment/dht/src/chord" + "berty.tech/berty/experiment/dht/src/gnunet" + "berty.tech/berty/experiment/dht/src/libp2p" + "berty.tech/berty/experiment/dht/src/matrix" . "github.com/smartystreets/goconvey/convey" ) diff --git a/test/experiment/go.mod b/test/experiment/go.mod index 4332df7500..f32dbe633b 100644 --- a/test/experiment/go.mod +++ b/test/experiment/go.mod @@ -1,4 +1,4 @@ -module berty.tech/experiment +module berty.tech/berty/experiment go 1.12 diff --git a/test/experiment/scw/add-service.yaml b/test/experiment/scw/add-service.yaml index af72976895..90036c8b47 100644 --- a/test/experiment/scw/add-service.yaml +++ b/test/experiment/scw/add-service.yaml @@ -4,7 +4,7 @@ tasks: - name: copy service copy: - src: "{{ local_home }}/src/berty.tech/experiment/scw/berty.service" + src: "{{ local_home }}/src/berty.tech/berty/experiment/scw/berty.service" dest: "/etc/systemd/system/multi-user.target.wants/berty.service" - name: reaload systemd shell: systemctl daemon-reload diff --git a/test/experiment/scw/run-daemon.yaml b/test/experiment/scw/run-daemon.yaml index a45b0254b7..6d9d97130c 100644 --- a/test/experiment/scw/run-daemon.yaml +++ b/test/experiment/scw/run-daemon.yaml @@ -5,7 +5,7 @@ - name: build berty local_action: module: shell - _raw_params: "cd $GOPATH/src/berty.tech && docker build -f Dockerfile.scw -t berty/berty . && docker run --rm --entrypoint /bin/sh berty/berty:latest -c \"cat /go/bin/berty\" > berty" + _raw_params: "cd $GOPATH/src/berty.tech/berty && docker build -f Dockerfile.scw -t berty/berty . && docker run --rm --entrypoint /bin/sh berty/berty:latest -c \"cat /go/bin/berty\" > berty" run_once: true register: command_output - debug: msg="{{ command_output.stdout }}"