fix imports

anyproto · May 23, 2023 · d937854 · d937854
1 parent a316323
commit d937854
Show file tree

Hide file tree

Showing 35 changed files with 156 additions and 155 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,16 +13,20 @@ 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)
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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