diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 413d1611..a7fa5ed7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,4 +10,4 @@ updates: schedule: interval: "weekly" ignore: - - dependency-name: "github.com/anytypeio/any-sync" + - dependency-name: "github.com/anyproto/any-sync" diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 24f28a0d..5cf48adf 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -13,7 +13,7 @@ jobs: go-version: - 1.19.5 env: - GOPRIVATE: github.com/anytypeio + GOPRIVATE: github.com/anyproto # redis for tests services: redis: diff --git a/.github/workflows/push-docker-image-manual.yml b/.github/workflows/push-docker-image-manual.yml index 33038da3..5a4f8c39 100644 --- a/.github/workflows/push-docker-image-manual.yml +++ b/.github/workflows/push-docker-image-manual.yml @@ -10,6 +10,6 @@ name: push-docker-image-manual jobs: push-docker-image-manual: - uses: anytypeio/any-sync-node/.github/workflows/push-docker-image-reusable.yml@main + uses: anyproto/any-sync-node/.github/workflows/push-docker-image-reusable.yml@main with: release: ${{ github.event.inputs.release }} diff --git a/.github/workflows/push-docker-image-release.yml b/.github/workflows/push-docker-image-release.yml index 594e0697..f304c1ee 100644 --- a/.github/workflows/push-docker-image-release.yml +++ b/.github/workflows/push-docker-image-release.yml @@ -6,7 +6,7 @@ name: push-docker-image-release jobs: push-docker-image-release: - uses: anytypeio/any-sync-node/.github/workflows/push-docker-image-reusable.yml@main + uses: anyproto/any-sync-node/.github/workflows/push-docker-image-reusable.yml@main secrets: inherit with: release: ${{ github.event.release.tag_name }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b673caa0..7eadbe54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - arch: arm64 rpm_arch: aarch64 env: - GOPRIVATE: github.com/anytypeio + GOPRIVATE: github.com/anyproto # redis for tests services: redis: diff --git a/Makefile b/Makefile index e567d437..16757d80 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: build test deps build-dev SHELL=/bin/bash -export GOPRIVATE=github.com/anytypeio +export GOPRIVATE=github.com/anyproto export PATH:=deps:$(PATH) export CGO_ENABLED:=1 BUILD_GOOS:=$(shell go env GOOS) @@ -13,12 +13,12 @@ else endif build: - @$(eval FLAGS := $$(shell PATH=$(PATH) govvv -flags -pkg github.com/anytypeio/any-sync/app)) - GOOS=$(BUILD_GOOS) GOARCH=$(BUILD_GOARCH) go build -v $(TAGS) -o bin/any-sync-filenode -ldflags "$(FLAGS) -X github.com/anytypeio/any-sync/app.AppName=any-sync-filenode" github.com/anytypeio/any-sync-filenode/cmd + @$(eval FLAGS := $$(shell PATH=$(PATH) govvv -flags -pkg github.com/anyproto/any-sync/app)) + GOOS=$(BUILD_GOOS) GOARCH=$(BUILD_GOARCH) go build -v $(TAGS) -o bin/any-sync-filenode -ldflags "$(FLAGS) -X github.com/anyproto/any-sync/app.AppName=any-sync-filenode" github.com/anyproto/any-sync-filenode/cmd build-dev: - @$(eval FLAGS := $$(shell PATH=$(PATH) govvv -flags -pkg github.com/anytypeio/any-sync/app)) - go build -v $(TAGS) -o bin/any-sync-filenode.dev --tags dev -ldflags "$(FLAGS)" github.com/anytypeio/any-sync-filenode/cmd + @$(eval FLAGS := $$(shell PATH=$(PATH) govvv -flags -pkg github.com/anyproto/any-sync/app)) + go build -v $(TAGS) -o bin/any-sync-filenode.dev --tags dev -ldflags "$(FLAGS)" github.com/anyproto/any-sync-filenode/cmd test: go test ./... --cover $(TAGS) @@ -26,3 +26,7 @@ test: deps: go mod download go build -o deps github.com/ahmetb/govvv + go build -o deps github.com/gogo/protobuf/protoc-gen-gogofaster + +proto: + protoc --gogofaster_out=:. index/redisindex/indexproto/protos/*.proto diff --git a/account/service.go b/account/service.go index e8ccf638..f64644cd 100644 --- a/account/service.go +++ b/account/service.go @@ -1,11 +1,11 @@ package account import ( - "github.com/anytypeio/any-sync-filenode/config" - commonaccount "github.com/anytypeio/any-sync/accountservice" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/commonspace/object/accountdata" - "github.com/anytypeio/any-sync/util/crypto" + "github.com/anyproto/any-sync-filenode/config" + commonaccount "github.com/anyproto/any-sync/accountservice" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/commonspace/object/accountdata" + "github.com/anyproto/any-sync/util/crypto" ) type service struct { diff --git a/cmd/filenode.go b/cmd/filenode.go index 39e5fc8c..97b152c4 100644 --- a/cmd/filenode.go +++ b/cmd/filenode.go @@ -4,23 +4,23 @@ import ( "context" "flag" "fmt" - "github.com/anytypeio/any-sync-filenode/account" - "github.com/anytypeio/any-sync-filenode/config" - "github.com/anytypeio/any-sync-filenode/filenode" - "github.com/anytypeio/any-sync-filenode/index/redisindex" - "github.com/anytypeio/any-sync-filenode/limit" - "github.com/anytypeio/any-sync-filenode/redisprovider" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/logger" - "github.com/anytypeio/any-sync/coordinator/coordinatorclient" - "github.com/anytypeio/any-sync/coordinator/nodeconfsource" - "github.com/anytypeio/any-sync/metric" - "github.com/anytypeio/any-sync/net/dialer" - "github.com/anytypeio/any-sync/net/pool" - "github.com/anytypeio/any-sync/net/rpc/server" - "github.com/anytypeio/any-sync/net/secureservice" - "github.com/anytypeio/any-sync/nodeconf" - "github.com/anytypeio/any-sync/nodeconf/nodeconfstore" + "github.com/anyproto/any-sync-filenode/account" + "github.com/anyproto/any-sync-filenode/config" + "github.com/anyproto/any-sync-filenode/filenode" + "github.com/anyproto/any-sync-filenode/index/redisindex" + "github.com/anyproto/any-sync-filenode/limit" + "github.com/anyproto/any-sync-filenode/redisprovider" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/logger" + "github.com/anyproto/any-sync/coordinator/coordinatorclient" + "github.com/anyproto/any-sync/coordinator/nodeconfsource" + "github.com/anyproto/any-sync/metric" + "github.com/anyproto/any-sync/net/dialer" + "github.com/anyproto/any-sync/net/pool" + "github.com/anyproto/any-sync/net/rpc/server" + "github.com/anyproto/any-sync/net/secureservice" + "github.com/anyproto/any-sync/nodeconf" + "github.com/anyproto/any-sync/nodeconf/nodeconfstore" "go.uber.org/zap" "net/http" _ "net/http/pprof" diff --git a/cmd/filenode_test.go b/cmd/filenode_test.go index a9f5d66f..cc1968f1 100644 --- a/cmd/filenode_test.go +++ b/cmd/filenode_test.go @@ -2,12 +2,12 @@ package main import ( "context" - "github.com/anytypeio/any-sync-filenode/config" - "github.com/anytypeio/any-sync-filenode/store/s3store" - commonaccount "github.com/anytypeio/any-sync/accountservice" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/metric" - "github.com/anytypeio/any-sync/net" + "github.com/anyproto/any-sync-filenode/config" + "github.com/anyproto/any-sync-filenode/store/s3store" + commonaccount "github.com/anyproto/any-sync/accountservice" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/metric" + "github.com/anyproto/any-sync/net" "github.com/stretchr/testify/require" "os" "testing" diff --git a/cmd/store.go b/cmd/store.go index 09e55947..48a544f3 100644 --- a/cmd/store.go +++ b/cmd/store.go @@ -3,8 +3,8 @@ package main import ( - "github.com/anytypeio/any-sync-filenode/store/s3store" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync-filenode/store/s3store" + "github.com/anyproto/any-sync/app" ) func store() app.Component { diff --git a/cmd/store_dev.go b/cmd/store_dev.go index c8ad315e..24e3357d 100644 --- a/cmd/store_dev.go +++ b/cmd/store_dev.go @@ -3,8 +3,8 @@ package main import ( - "github.com/anytypeio/any-sync-filenode/store/filedevstore" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync-filenode/store/filedevstore" + "github.com/anyproto/any-sync/app" ) func store() app.Component { diff --git a/config/config.go b/config/config.go index 587b95c2..58e769b4 100644 --- a/config/config.go +++ b/config/config.go @@ -1,13 +1,13 @@ package config import ( - "github.com/anytypeio/any-sync-filenode/redisprovider" - "github.com/anytypeio/any-sync-filenode/store/s3store" - commonaccount "github.com/anytypeio/any-sync/accountservice" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/metric" - "github.com/anytypeio/any-sync/net" - "github.com/anytypeio/any-sync/nodeconf" + "github.com/anyproto/any-sync-filenode/redisprovider" + "github.com/anyproto/any-sync-filenode/store/s3store" + commonaccount "github.com/anyproto/any-sync/accountservice" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/metric" + "github.com/anyproto/any-sync/net" + "github.com/anyproto/any-sync/nodeconf" "gopkg.in/yaml.v3" "os" ) diff --git a/filenode/filenode.go b/filenode/filenode.go index c5452a36..12c43ac8 100644 --- a/filenode/filenode.go +++ b/filenode/filenode.go @@ -3,18 +3,18 @@ package filenode import ( "context" "errors" - "github.com/anytypeio/any-sync-filenode/index" - "github.com/anytypeio/any-sync-filenode/index/redisindex" - "github.com/anytypeio/any-sync-filenode/limit" - "github.com/anytypeio/any-sync-filenode/store" - "github.com/anytypeio/any-sync-filenode/testutil" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/logger" - "github.com/anytypeio/any-sync/commonfile/fileblockstore" - "github.com/anytypeio/any-sync/commonfile/fileproto" - "github.com/anytypeio/any-sync/commonfile/fileproto/fileprotoerr" - "github.com/anytypeio/any-sync/metric" - "github.com/anytypeio/any-sync/net/rpc/server" + "github.com/anyproto/any-sync-filenode/index" + "github.com/anyproto/any-sync-filenode/index/redisindex" + "github.com/anyproto/any-sync-filenode/limit" + "github.com/anyproto/any-sync-filenode/store" + "github.com/anyproto/any-sync-filenode/testutil" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/logger" + "github.com/anyproto/any-sync/commonfile/fileblockstore" + "github.com/anyproto/any-sync/commonfile/fileproto" + "github.com/anyproto/any-sync/commonfile/fileproto/fileprotoerr" + "github.com/anyproto/any-sync/metric" + "github.com/anyproto/any-sync/net/rpc/server" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" ) diff --git a/filenode/filenode_test.go b/filenode/filenode_test.go index 9950057a..6e138f9f 100644 --- a/filenode/filenode_test.go +++ b/filenode/filenode_test.go @@ -2,20 +2,20 @@ package filenode import ( "context" - "github.com/anytypeio/any-sync-filenode/config" - "github.com/anytypeio/any-sync-filenode/index" - "github.com/anytypeio/any-sync-filenode/index/mock_index" - "github.com/anytypeio/any-sync-filenode/index/redisindex" - "github.com/anytypeio/any-sync-filenode/limit" - "github.com/anytypeio/any-sync-filenode/limit/mock_limit" - "github.com/anytypeio/any-sync-filenode/store/mock_store" - "github.com/anytypeio/any-sync-filenode/testutil" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/commonfile/fileblockstore" - "github.com/anytypeio/any-sync/commonfile/fileproto" - "github.com/anytypeio/any-sync/commonfile/fileproto/fileprotoerr" - "github.com/anytypeio/any-sync/metric" - "github.com/anytypeio/any-sync/net/rpc/rpctest" + "github.com/anyproto/any-sync-filenode/config" + "github.com/anyproto/any-sync-filenode/index" + "github.com/anyproto/any-sync-filenode/index/mock_index" + "github.com/anyproto/any-sync-filenode/index/redisindex" + "github.com/anyproto/any-sync-filenode/limit" + "github.com/anyproto/any-sync-filenode/limit/mock_limit" + "github.com/anyproto/any-sync-filenode/store/mock_store" + "github.com/anyproto/any-sync-filenode/testutil" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/commonfile/fileblockstore" + "github.com/anyproto/any-sync/commonfile/fileproto" + "github.com/anyproto/any-sync/commonfile/fileproto/fileprotoerr" + "github.com/anyproto/any-sync/metric" + "github.com/anyproto/any-sync/net/rpc/rpctest" "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" diff --git a/filenode/rpchandler.go b/filenode/rpchandler.go index 746a7aa7..40c79b0e 100644 --- a/filenode/rpchandler.go +++ b/filenode/rpchandler.go @@ -2,9 +2,9 @@ package filenode import ( "context" - "github.com/anytypeio/any-sync/commonfile/fileproto" - "github.com/anytypeio/any-sync/commonfile/fileproto/fileprotoerr" - "github.com/anytypeio/any-sync/metric" + "github.com/anyproto/any-sync/commonfile/fileproto" + "github.com/anyproto/any-sync/commonfile/fileproto/fileprotoerr" + "github.com/anyproto/any-sync/metric" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "go.uber.org/zap" diff --git a/go.mod b/go.mod index 99461973..b72eb9da 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/anytypeio/any-sync-filenode +module github.com/anyproto/any-sync-filenode go 1.19 require ( github.com/ahmetb/govvv v0.3.0 - github.com/anytypeio/any-sync v0.0.48 - github.com/aws/aws-sdk-go v1.44.266 + github.com/anyproto/any-sync v0.1.0 + github.com/aws/aws-sdk-go v1.44.267 github.com/go-redsync/redsync/v4 v4.8.1 github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 @@ -21,15 +21,15 @@ require ( require ( filippo.io/edwards25519 v1.0.0 // indirect - github.com/anytypeio/go-chash v0.1.0 // indirect - github.com/anytypeio/go-slip10 v0.0.0-20200330112030-a352ca8495e4 // indirect - github.com/anytypeio/go-slip21 v0.0.0-20200218204727-e2e51e20ab51 // indirect + github.com/anyproto/go-chash v0.1.0 // indirect + github.com/anyproto/go-slip10 v1.0.0 // indirect + github.com/anyproto/go-slip21 v1.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -40,7 +40,6 @@ require ( github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect - github.com/kr/text v0.2.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-libp2p v0.27.3 // indirect github.com/mattn/go-isatty v0.0.18 // indirect @@ -60,13 +59,13 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/zeebo/errs v1.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.9.0 // indirect - golang.org/x/exp v0.0.0-20230420155640-133eef4313cb // indirect + golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/sys v0.8.0 // indirect google.golang.org/protobuf v1.30.0 // indirect lukechampine.com/blake3 v1.1.7 // indirect diff --git a/go.sum b/go.sum index 289c3481..83b46538 100644 --- a/go.sum +++ b/go.sum @@ -4,18 +4,18 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/ahmetb/govvv v0.3.0 h1:YGLGwEyiUwHFy5eh/RUhdupbuaCGBYn5T5GWXp+WJB0= github.com/ahmetb/govvv v0.3.0/go.mod h1:4WRFpdWtc/YtKgPFwa1dr5+9hiRY5uKAL08bOlxOR6s= -github.com/anytypeio/any-sync v0.0.48 h1:aW2CykAYZR222Zps1pYp88kKqDm5DucUT4x82VcLByg= -github.com/anytypeio/any-sync v0.0.48/go.mod h1:sHaXDZaufpyESUT+R5SYNwrU5zsdSFjFoOHo26gUQic= -github.com/anytypeio/go-chash v0.1.0 h1:nYCMh13SEai/7cXRUoKfU27uASj7XEF6NhvY6hFMKY8= -github.com/anytypeio/go-chash v0.1.0/go.mod h1:Q7XiggkMrThRFAwYSItzLOT9OPC8a497SLZtgmJtC/I= -github.com/anytypeio/go-slip10 v0.0.0-20200330112030-a352ca8495e4 h1:jB5Ke7NVoW52i65PtLFBr5Q5k6RskIY8L70pgnBcnWo= -github.com/anytypeio/go-slip10 v0.0.0-20200330112030-a352ca8495e4/go.mod h1:/8GIEJBE5wmdgcE49JPdupnHNUf7bEn6C+aArfWqvw8= -github.com/anytypeio/go-slip21 v0.0.0-20200218204727-e2e51e20ab51 h1:3Y+18zBC8LZgcL3l2dgoTEIzIUzCZa/kN0UV3ZWpbuA= -github.com/anytypeio/go-slip21 v0.0.0-20200218204727-e2e51e20ab51/go.mod h1:SoKy+W8Mf6v7XBV30xFWkIFMs7UnXwsNGrGV12yVkEs= -github.com/aws/aws-sdk-go v1.44.266 h1:MWd775dcYf7NrwgcHLtlsIbWoWkX8p4vomfNHr88zH0= -github.com/aws/aws-sdk-go v1.44.266/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/anyproto/any-sync v0.1.0 h1:BO+vHnQRyu6jDzD/WqHoh59swSaKPFSbmS9Vk4HtBF0= +github.com/anyproto/any-sync v0.1.0/go.mod h1:lPpo8MhGrL834A6n1MRFIxiawDz9tVHuqBdTksuR4zM= +github.com/anyproto/go-chash v0.1.0 h1:I9meTPjXFRfXZHRJzjOHC/XF7Q5vzysKkiT/grsogXY= +github.com/anyproto/go-chash v0.1.0/go.mod h1:0UjNQi3PDazP0fINpFYu6VKhuna+W/V+1vpXHAfNgLY= +github.com/anyproto/go-slip10 v1.0.0 h1:uAEtSuudR3jJBOfkOXf3bErxVoxbuKwdoJN55M1i6IA= +github.com/anyproto/go-slip10 v1.0.0/go.mod h1:BCmIlM1KB8wX6K4/8pOvxPl9oVKfEvZ5vsmO5rkK6vg= +github.com/anyproto/go-slip21 v1.0.0 h1:CI7lUqTIwmPOEGVAj4jyNLoICvueh++0U2HoAi3m2ZY= +github.com/anyproto/go-slip21 v1.0.0/go.mod h1:gbIJt7HAdr5DuT4f2pFTKCBSUWYsm/fysHBNqgsuxT0= +github.com/aws/aws-sdk-go v1.44.267 h1:Asrp6EMqqRxZvjK0NjzkWcrOk15RnWtupuUrUuZMabk= +github.com/aws/aws-sdk-go v1.44.267/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.1 h1:Heo0FGXzOxUHquZbraxt+tT7UXVDhesUQH5ISbsOkCQ= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bsm/ginkgo/v2 v2.5.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= @@ -27,15 +27,14 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= -github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -107,9 +106,8 @@ github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8t github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-libp2p v0.27.3 h1:tkV/zm3KCZ4R5er9Xcs2pt0YNB4JH0iBfGAtHJdLHRs= @@ -172,8 +170,8 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps= github.com/redis/go-redis/v9 v9.0.4 h1:FC82T+CHJ/Q/PdyLW++GeCO+Ol59Y4T7R4jbgjvktgc= github.com/redis/go-redis/v9 v9.0.4/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -218,8 +216,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/exp v0.0.0-20230420155640-133eef4313cb h1:rhjz/8Mbfa8xROFiH+MQphmAmgqRM0bOMnytznhWEXk= -golang.org/x/exp v0.0.0-20230420155640-133eef4313cb/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= +golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= diff --git a/index/index.go b/index/index.go index 16934920..523d6c8b 100644 --- a/index/index.go +++ b/index/index.go @@ -1,10 +1,10 @@ -//go:generate mockgen -destination mock_index/mock_index.go github.com/anytypeio/any-sync-filenode/index Index +//go:generate mockgen -destination mock_index/mock_index.go github.com/anyproto/any-sync-filenode/index Index package index import ( "context" "errors" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync/app" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" ) diff --git a/index/mock_index/mock_index.go b/index/mock_index/mock_index.go index 8cdb3736..41d3eac7 100644 --- a/index/mock_index/mock_index.go +++ b/index/mock_index/mock_index.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/any-sync-filenode/index (interfaces: Index) +// Source: github.com/anyproto/any-sync-filenode/index (interfaces: Index) // Package mock_index is a generated GoMock package. package mock_index @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - index "github.com/anytypeio/any-sync-filenode/index" - app "github.com/anytypeio/any-sync/app" + index "github.com/anyproto/any-sync-filenode/index" + app "github.com/anyproto/any-sync/app" gomock "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" diff --git a/index/redisindex/bind_test.go b/index/redisindex/bind_test.go index 422140fc..51d40d19 100644 --- a/index/redisindex/bind_test.go +++ b/index/redisindex/bind_test.go @@ -1,7 +1,7 @@ package redisindex import ( - "github.com/anytypeio/any-sync-filenode/testutil" + "github.com/anyproto/any-sync-filenode/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/index/redisindex/fcidlist.go b/index/redisindex/fcidlist.go index 8a2e2df8..d5b34b8e 100644 --- a/index/redisindex/fcidlist.go +++ b/index/redisindex/fcidlist.go @@ -3,7 +3,7 @@ package redisindex import ( "bytes" "context" - "github.com/anytypeio/any-sync-filenode/index/redisindex/indexproto" + "github.com/anyproto/any-sync-filenode/index/redisindex/indexproto" "github.com/go-redsync/redsync/v4" "github.com/golang/snappy" "github.com/ipfs/go-cid" diff --git a/index/redisindex/redisindex.go b/index/redisindex/redisindex.go index bdc69046..fd7b8208 100644 --- a/index/redisindex/redisindex.go +++ b/index/redisindex/redisindex.go @@ -2,11 +2,11 @@ package redisindex import ( "context" - "github.com/anytypeio/any-sync-filenode/index" - "github.com/anytypeio/any-sync-filenode/index/redisindex/indexproto" - "github.com/anytypeio/any-sync-filenode/redisprovider" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/logger" + "github.com/anyproto/any-sync-filenode/index" + "github.com/anyproto/any-sync-filenode/index/redisindex/indexproto" + "github.com/anyproto/any-sync-filenode/redisprovider" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/logger" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" blocks "github.com/ipfs/go-block-format" diff --git a/index/redisindex/redisindex_test.go b/index/redisindex/redisindex_test.go index a8557e2c..b1ec2249 100644 --- a/index/redisindex/redisindex_test.go +++ b/index/redisindex/redisindex_test.go @@ -2,9 +2,9 @@ package redisindex import ( "context" - "github.com/anytypeio/any-sync-filenode/redisprovider/testredisprovider" - "github.com/anytypeio/any-sync-filenode/testutil" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync-filenode/redisprovider/testredisprovider" + "github.com/anyproto/any-sync-filenode/testutil" + "github.com/anyproto/any-sync/app" blocks "github.com/ipfs/go-block-format" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/index/redisindex/unbind_test.go b/index/redisindex/unbind_test.go index 29109687..bbf16f22 100644 --- a/index/redisindex/unbind_test.go +++ b/index/redisindex/unbind_test.go @@ -1,7 +1,7 @@ package redisindex import ( - "github.com/anytypeio/any-sync-filenode/testutil" + "github.com/anyproto/any-sync-filenode/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/limit/limit.go b/limit/limit.go index af2fee03..e82b74d2 100644 --- a/limit/limit.go +++ b/limit/limit.go @@ -1,14 +1,14 @@ -//go:generate mockgen -destination mock_limit/mock_limit.go github.com/anytypeio/any-sync-filenode/limit Limit +//go:generate mockgen -destination mock_limit/mock_limit.go github.com/anyproto/any-sync-filenode/limit Limit package limit import ( "context" "encoding/hex" "fmt" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/ocache" - "github.com/anytypeio/any-sync/coordinator/coordinatorclient" - "github.com/anytypeio/any-sync/net/peer" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/ocache" + "github.com/anyproto/any-sync/coordinator/coordinatorclient" + "github.com/anyproto/any-sync/net/peer" "go.uber.org/atomic" "strings" "time" diff --git a/limit/limit_test.go b/limit/limit_test.go index c274bb55..a8964221 100644 --- a/limit/limit_test.go +++ b/limit/limit_test.go @@ -2,10 +2,10 @@ package limit import ( "context" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/coordinator/coordinatorclient" - "github.com/anytypeio/any-sync/coordinator/coordinatorclient/mock_coordinatorclient" - "github.com/anytypeio/any-sync/net/peer" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/coordinator/coordinatorclient" + "github.com/anyproto/any-sync/coordinator/coordinatorclient/mock_coordinatorclient" + "github.com/anyproto/any-sync/net/peer" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/limit/mock_limit/mock_limit.go b/limit/mock_limit/mock_limit.go index a542d0e5..9b93234d 100644 --- a/limit/mock_limit/mock_limit.go +++ b/limit/mock_limit/mock_limit.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/any-sync-filenode/limit (interfaces: Limit) +// Source: github.com/anyproto/any-sync-filenode/limit (interfaces: Limit) // Package mock_limit is a generated GoMock package. package mock_limit @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - app "github.com/anytypeio/any-sync/app" + app "github.com/anyproto/any-sync/app" gomock "github.com/golang/mock/gomock" ) diff --git a/redisprovider/redisprovider.go b/redisprovider/redisprovider.go index 96345023..2d74beca 100644 --- a/redisprovider/redisprovider.go +++ b/redisprovider/redisprovider.go @@ -2,7 +2,7 @@ package redisprovider import ( "context" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync/app" "github.com/redis/go-redis/v9" ) diff --git a/redisprovider/testredisprovider/testredisprovider.go b/redisprovider/testredisprovider/testredisprovider.go index a8a6b358..6e9a5120 100644 --- a/redisprovider/testredisprovider/testredisprovider.go +++ b/redisprovider/testredisprovider/testredisprovider.go @@ -3,8 +3,8 @@ package testredisprovider import ( "context" "fmt" - "github.com/anytypeio/any-sync-filenode/redisprovider" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync-filenode/redisprovider" + "github.com/anyproto/any-sync/app" "github.com/redis/go-redis/v9" ) diff --git a/store/filedevstore/filedevstore.go b/store/filedevstore/filedevstore.go index 3dffbc68..45482276 100644 --- a/store/filedevstore/filedevstore.go +++ b/store/filedevstore/filedevstore.go @@ -3,11 +3,11 @@ package filedevstore import ( "context" "fmt" - "github.com/anytypeio/any-sync-filenode/config" - "github.com/anytypeio/any-sync-filenode/store" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/logger" - "github.com/anytypeio/any-sync/commonfile/fileblockstore" + "github.com/anyproto/any-sync-filenode/config" + "github.com/anyproto/any-sync-filenode/store" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/logger" + "github.com/anyproto/any-sync/commonfile/fileblockstore" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "os" diff --git a/store/mock_store/mock_store.go b/store/mock_store/mock_store.go index 5acdae0c..d5730aa9 100644 --- a/store/mock_store/mock_store.go +++ b/store/mock_store/mock_store.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/any-sync-filenode/store (interfaces: Store) +// Source: github.com/anyproto/any-sync-filenode/store (interfaces: Store) // Package mock_store is a generated GoMock package. package mock_store @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - app "github.com/anytypeio/any-sync/app" + app "github.com/anyproto/any-sync/app" gomock "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" diff --git a/store/s3store/s3store.go b/store/s3store/s3store.go index efb746d6..d0fe0b1d 100644 --- a/store/s3store/s3store.go +++ b/store/s3store/s3store.go @@ -4,10 +4,10 @@ import ( "bytes" "context" "fmt" - "github.com/anytypeio/any-sync-filenode/store" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/app/logger" - "github.com/anytypeio/any-sync/commonfile/fileblockstore" + "github.com/anyproto/any-sync-filenode/store" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/app/logger" + "github.com/anyproto/any-sync/commonfile/fileblockstore" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" diff --git a/store/s3store/s3store_test.go b/store/s3store/s3store_test.go index 9864e190..75a44892 100644 --- a/store/s3store/s3store_test.go +++ b/store/s3store/s3store_test.go @@ -3,7 +3,7 @@ package s3store import ( "context" "fmt" - "github.com/anytypeio/any-sync/app" + "github.com/anyproto/any-sync/app" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" diff --git a/store/store.go b/store/store.go index b5e866fb..f50ca768 100644 --- a/store/store.go +++ b/store/store.go @@ -1,10 +1,10 @@ -//go:generate mockgen -destination mock_store/mock_store.go github.com/anytypeio/any-sync-filenode/store Store +//go:generate mockgen -destination mock_store/mock_store.go github.com/anyproto/any-sync-filenode/store Store package store import ( "context" - "github.com/anytypeio/any-sync/app" - "github.com/anytypeio/any-sync/commonfile/fileblockstore" + "github.com/anyproto/any-sync/app" + "github.com/anyproto/any-sync/commonfile/fileblockstore" "github.com/ipfs/go-cid" ) diff --git a/testutil/block.go b/testutil/block.go index 46349fd6..e49a7aae 100644 --- a/testutil/block.go +++ b/testutil/block.go @@ -1,7 +1,7 @@ package testutil import ( - "github.com/anytypeio/any-sync/util/cidutil" + "github.com/anyproto/any-sync/util/cidutil" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "io"