From 9149d6ed03e409fb9d00e2951727159d814b988d Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Mon, 9 May 2022 23:49:54 +0200 Subject: [PATCH] refactor: go.mod, package name --- .circleci/main.yml | 4 +-- assets/assets.go | 4 +-- cmd/ipfs/Rules.mk | 4 +-- cmd/ipfs/add_migrations.go | 10 +++--- cmd/ipfs/daemon.go | 32 +++++++++---------- cmd/ipfs/debug.go | 2 +- cmd/ipfs/init.go | 12 +++---- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 18 +++++------ cmd/ipfs/pinmfs.go | 4 +-- cmd/ipfs/pinmfs_test.go | 2 +- cmd/ipfswatch/ipfswatch_test.go | 2 +- cmd/ipfswatch/main.go | 10 +++--- commands/context.go | 8 ++--- config/experiments.go | 2 +- config/gateway.go | 2 +- config/serialize/serialize.go | 2 +- config/serialize/serialize_test.go | 2 +- core/builder.go | 4 +-- core/commands/active.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 4 +-- core/commands/block.go | 4 +-- core/commands/bootstrap.go | 8 ++--- core/commands/cat.go | 2 +- core/commands/cmdenv/env.go | 4 +-- core/commands/cmdutils/utils.go | 2 +- core/commands/commands.go | 2 +- core/commands/config.go | 8 ++--- core/commands/dag/dag.go | 4 +-- core/commands/dag/export.go | 2 +- core/commands/dag/get.go | 2 +- core/commands/dag/import.go | 4 +-- core/commands/dag/put.go | 4 +-- core/commands/dag/resolve.go | 2 +- core/commands/dag/stat.go | 4 +-- core/commands/dht.go | 2 +- core/commands/dns.go | 6 ++-- core/commands/files.go | 4 +-- core/commands/filestore.go | 6 ++-- core/commands/get.go | 4 +-- core/commands/id.go | 8 ++--- core/commands/keystore.go | 14 ++++---- core/commands/ls.go | 2 +- core/commands/mount_unix.go | 8 ++--- core/commands/multibase.go | 2 +- core/commands/name/ipns.go | 2 +- core/commands/name/ipnsps.go | 4 +-- core/commands/name/publish.go | 4 +-- core/commands/object/diff.go | 4 +-- core/commands/object/object.go | 16 +++++----- core/commands/object/patch.go | 14 ++++---- core/commands/p2p.go | 6 ++-- core/commands/pin/pin.go | 6 ++-- core/commands/pin/remotepin.go | 8 ++--- core/commands/ping.go | 2 +- core/commands/profile.go | 6 ++-- core/commands/pubsub.go | 8 ++--- core/commands/refs.go | 2 +- core/commands/repo.go | 14 ++++---- core/commands/resolve.go | 4 +-- core/commands/root.go | 12 +++---- core/commands/shutdown.go | 2 +- core/commands/stat.go | 2 +- core/commands/stat_dht.go | 2 +- core/commands/stat_provide.go | 2 +- core/commands/swarm.go | 12 +++---- core/commands/sysdiag.go | 6 ++-- core/commands/tar.go | 10 +++--- core/commands/unixfs/ls.go | 4 +-- core/commands/unixfs/unixfs.go | 2 +- core/commands/urlstore.go | 2 +- core/commands/version.go | 2 +- core/core.go | 14 ++++---- core/core_test.go | 4 +-- core/coreapi/block.go | 4 +-- core/coreapi/coreapi.go | 6 ++-- core/coreapi/dag.go | 2 +- core/coreapi/dht.go | 2 +- core/coreapi/key.go | 2 +- core/coreapi/name.go | 2 +- core/coreapi/object.go | 2 +- core/coreapi/path.go | 2 +- core/coreapi/pin.go | 2 +- core/coreapi/pubsub.go | 2 +- core/coreapi/swarm.go | 2 +- core/coreapi/test/api_test.go | 14 ++++---- core/coreapi/unixfs.go | 8 ++--- core/corehttp/commands.go | 10 +++--- core/corehttp/corehttp.go | 2 +- core/corehttp/gateway.go | 6 ++-- core/corehttp/gateway_handler.go | 16 +++++----- core/corehttp/gateway_handler_block.go | 2 +- core/corehttp/gateway_handler_car.go | 6 ++-- core/corehttp/gateway_handler_unixfs.go | 2 +- core/corehttp/gateway_handler_unixfs_dir.go | 8 ++--- core/corehttp/gateway_handler_unixfs_file.go | 6 ++-- core/corehttp/gateway_indexPage.go | 2 +- core/corehttp/gateway_test.go | 10 +++--- core/corehttp/hostname.go | 12 +++---- core/corehttp/hostname_test.go | 4 +-- core/corehttp/logs.go | 2 +- core/corehttp/metrics.go | 2 +- core/corehttp/metrics_test.go | 2 +- core/corehttp/mutex_profile.go | 2 +- core/corehttp/option_test.go | 2 +- core/corehttp/p2p_proxy.go | 2 +- core/corehttp/p2p_proxy_test.go | 2 +- core/corehttp/redirect.go | 2 +- core/corerepo/gc.go | 6 ++-- core/corerepo/stat.go | 4 +-- core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 8 ++--- core/coreunix/metadata.go | 2 +- core/coreunix/metadata_test.go | 2 +- core/mock/mock.go | 10 +++--- core/node/bitswap.go | 6 ++-- core/node/builder.go | 8 ++--- core/node/core.go | 4 +-- core/node/dns.go | 2 +- core/node/graphsync.go | 2 +- core/node/groups.go | 6 ++-- core/node/ipns.go | 2 +- core/node/libp2p/discovery.go | 2 +- core/node/libp2p/host.go | 4 +-- core/node/libp2p/libp2p.go | 4 +-- core/node/libp2p/nat.go | 2 +- core/node/libp2p/pnet.go | 2 +- core/node/libp2p/pubsub.go | 2 +- core/node/libp2p/rcmgr.go | 4 +-- core/node/libp2p/rcmgr_defaults.go | 2 +- core/node/libp2p/relay.go | 2 +- core/node/libp2p/routing.go | 6 ++-- core/node/libp2p/sec.go | 2 +- core/node/libp2p/smux.go | 2 +- core/node/libp2p/topicdiscovery.go | 2 +- core/node/libp2p/transport.go | 2 +- core/node/peering.go | 2 +- core/node/provider.go | 6 ++-- core/node/storage.go | 8 ++--- fuse/ipns/common.go | 2 +- fuse/ipns/ipns_test.go | 4 +-- fuse/ipns/mount_unix.go | 6 ++-- fuse/node/mount_darwin.go | 16 +++++----- fuse/node/mount_nofuse.go | 2 +- fuse/node/mount_notsupp.go | 4 +-- fuse/node/mount_test.go | 6 ++-- fuse/node/mount_unix.go | 8 ++--- fuse/node/mount_windows.go | 2 +- fuse/readonly/ipfs_test.go | 6 ++-- fuse/readonly/mount_unix.go | 4 +-- fuse/readonly/readonly_unix.go | 2 +- go.mod | 2 +- mk/golang.mk | 4 +-- plugin/daemoninternal.go | 2 +- plugin/datastore.go | 2 +- plugin/loader/load_nocgo.go | 2 +- plugin/loader/load_noplugin.go | 2 +- plugin/loader/load_unix.go | 2 +- plugin/loader/loader.go | 12 +++---- plugin/loader/preload.go | 12 +++---- plugin/loader/preload.sh | 2 +- plugin/loader/preload_list | 12 +++---- plugin/plugins/badgerds/badgerds.go | 6 ++-- plugin/plugins/dagjose/dagjose.go | 2 +- plugin/plugins/flatfs/flatfs.go | 6 ++-- plugin/plugins/git/git.go | 2 +- plugin/plugins/levelds/levelds.go | 6 ++-- plugin/plugins/peerlog/peerlog.go | 4 +-- profile/profile.go | 2 +- repo/common/common_test.go | 2 +- repo/fsrepo/config_test.go | 6 ++-- repo/fsrepo/datastores.go | 2 +- repo/fsrepo/fsrepo.go | 16 +++++----- repo/fsrepo/fsrepo_test.go | 4 +-- .../migrations/ipfsfetcher/ipfsfetcher.go | 12 +++---- .../ipfsfetcher/ipfsfetcher_test.go | 4 +-- repo/fsrepo/migrations/migrations.go | 2 +- repo/fsrepo/migrations/migrations_test.go | 2 +- repo/fsrepo/misc.go | 2 +- repo/mock.go | 2 +- repo/repo.go | 2 +- test/bench/bench_cli_ipfs_add/main.go | 4 +-- test/bench/offline_add/main.go | 4 +-- test/bin/Rules.mk | 28 ++++++++-------- test/dependencies/go.mod | 2 +- test/integration/addcat_test.go | 10 +++--- test/integration/bench_cat_test.go | 10 +++--- test/integration/bench_test.go | 2 +- test/integration/bitswap_wo_routing_test.go | 6 ++-- test/integration/three_legged_cat_test.go | 8 ++--- test/integration/wan_lan_dht_test.go | 6 ++-- test/sharness/t0280-plugin-data/example.go | 2 +- tracing/tracing.go | 2 +- version.go | 2 +- 195 files changed, 487 insertions(+), 487 deletions(-) diff --git a/.circleci/main.yml b/.circleci/main.yml index 7d80f03ff9d5..b313c5e0f32a 100644 --- a/.circleci/main.yml +++ b/.circleci/main.yml @@ -118,11 +118,11 @@ jobs: cp go.sum go.sum.bak # make sure the examples run against the current version of go-ipfs - go mod edit -replace github.com/ipfs/go-ipfs=./../../.. + go mod edit -replace github.com/ipfs/ipfs-banana=./../../.. go mod tidy # use the internal config package when we test the current version of go-ipfs - sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/go-ipfs/config";' ./main.go + sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/ipfs-banana/config";' ./main.go go test -v ./... diff --git a/assets/assets.go b/assets/assets.go index ff87eec12cef..3de9c6e4551c 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -9,8 +9,8 @@ import ( gopath "path" "strconv" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/coreapi" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/coreapi" "github.com/cespare/xxhash" cid "github.com/ipfs/go-cid" diff --git a/cmd/ipfs/Rules.mk b/cmd/ipfs/Rules.mk index 2a768b5fc8a4..dc663c426f56 100644 --- a/cmd/ipfs/Rules.mk +++ b/cmd/ipfs/Rules.mk @@ -13,7 +13,7 @@ PATH := $(realpath $(d)):$(PATH) # DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go # DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go -$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs".CurrentCommit=$(git-hash)" +$(d)_flags =-ldflags="-X "github.com/ipfs/ipfs-banana".CurrentCommit=$(git-hash)" $(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags) @@ -42,7 +42,7 @@ CLEAN += $(COVER_BIN_$(d)) $(COVER_BIN_$(d)): GOTAGS += testrunmain $(COVER_BIN_$(d)): $(d) $$(DEPS_GO) ALWAYS - $(eval TMP_PKGS := $(shell $(GOCC) list -f '{{range .Deps}}{{.}} {{end}}' $(go-flags-with-tags) ./cmd/ipfs | sed 's/ /\n/g' | grep ipfs/go-ipfs) $(call go-pkg-name,$<)) + $(eval TMP_PKGS := $(shell $(GOCC) list -f '{{range .Deps}}{{.}} {{end}}' $(go-flags-with-tags) ./cmd/ipfs | sed 's/ /\n/g' | grep ipfs/ipfs-banana) $(call go-pkg-name,$<)) $(eval TMP_LIST := $(call join-with,$(comma),$(TMP_PKGS))) @echo $(GOCC) test $@ -c -covermode atomic -coverpkg ... $(go-flags-with-tags) ./$(@D) # for info @$(GOCC) test -o $@ -c -covermode atomic -coverpkg $(TMP_LIST) $(go-flags-with-tags) ./$(@D) 2>&1 | (grep -v 'warning: no packages being tested' || true) diff --git a/cmd/ipfs/add_migrations.go b/cmd/ipfs/add_migrations.go index 58b62e4f7771..93adba17255b 100644 --- a/cmd/ipfs/add_migrations.go +++ b/cmd/ipfs/add_migrations.go @@ -10,10 +10,10 @@ import ( "path/filepath" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/coreapi" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/coreapi" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations/ipfsfetcher" coreiface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/options" ipath "github.com/ipfs/interface-go-ipfs-core/path" @@ -37,7 +37,7 @@ func addMigrations(ctx context.Context, node *core.IpfsNode, fetcher migrations. if err != nil { return err } - case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/go-ipfs/issues/8780 + case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/ipfs-banana/issues/8780 // Add the downloaded migration files directly if migrations.DownloadDirectory != "" { var paths []string diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 14054c36fff4..24c3e6bc9528 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -16,21 +16,21 @@ import ( multierror "github.com/hashicorp/go-multierror" - version "github.com/ipfs/go-ipfs" - utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util" - oldcmds "github.com/ipfs/go-ipfs/commands" - config "github.com/ipfs/go-ipfs/config" - cserial "github.com/ipfs/go-ipfs/config/serialize" - "github.com/ipfs/go-ipfs/core" - commands "github.com/ipfs/go-ipfs/core/commands" - "github.com/ipfs/go-ipfs/core/coreapi" - corehttp "github.com/ipfs/go-ipfs/core/corehttp" - corerepo "github.com/ipfs/go-ipfs/core/corerepo" - libp2p "github.com/ipfs/go-ipfs/core/node/libp2p" - nodeMount "github.com/ipfs/go-ipfs/fuse/node" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher" + version "github.com/ipfs/ipfs-banana" + utilmain "github.com/ipfs/ipfs-banana/cmd/ipfs/util" + oldcmds "github.com/ipfs/ipfs-banana/commands" + config "github.com/ipfs/ipfs-banana/config" + cserial "github.com/ipfs/ipfs-banana/config/serialize" + "github.com/ipfs/ipfs-banana/core" + commands "github.com/ipfs/ipfs-banana/core/commands" + "github.com/ipfs/ipfs-banana/core/coreapi" + corehttp "github.com/ipfs/ipfs-banana/core/corehttp" + corerepo "github.com/ipfs/ipfs-banana/core/corerepo" + libp2p "github.com/ipfs/ipfs-banana/core/node/libp2p" + nodeMount "github.com/ipfs/ipfs-banana/fuse/node" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations/ipfsfetcher" sockets "github.com/libp2p/go-socket-activation" cmds "github.com/ipfs/go-ipfs-cmds" @@ -801,7 +801,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, e } if len(cfg.Gateway.PathPrefixes) > 0 { - log.Error("Support for X-Ipfs-Gateway-Prefix and Gateway.PathPrefixes is deprecated and will be removed in the next release. Please comment on the issue if you're using this feature: https://github.com/ipfs/go-ipfs/issues/7702") + log.Error("Support for X-Ipfs-Gateway-Prefix and Gateway.PathPrefixes is deprecated and will be removed in the next release. Please comment on the issue if you're using this feature: https://github.com/ipfs/ipfs-banana/issues/7702") } node, err := cctx.ConstructNode() diff --git a/cmd/ipfs/debug.go b/cmd/ipfs/debug.go index 5eeb590e2c5f..7154788feb1a 100644 --- a/cmd/ipfs/debug.go +++ b/cmd/ipfs/debug.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/ipfs/go-ipfs/profile" + "github.com/ipfs/ipfs-banana/profile" ) func init() { diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index dfbf01bb3a64..0a72bce49b20 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -10,17 +10,17 @@ import ( "path/filepath" "strings" - assets "github.com/ipfs/go-ipfs/assets" - oldcmds "github.com/ipfs/go-ipfs/commands" - core "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/commands" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + assets "github.com/ipfs/ipfs-banana/assets" + oldcmds "github.com/ipfs/ipfs-banana/commands" + core "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/commands" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" path "github.com/ipfs/go-path" unixfs "github.com/ipfs/go-unixfs" cmds "github.com/ipfs/go-ipfs-cmds" files "github.com/ipfs/go-ipfs-files" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" options "github.com/ipfs/interface-go-ipfs-core/options" ) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 6abe3f5e4147..fe2fa16081db 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -1,7 +1,7 @@ package main import ( - commands "github.com/ipfs/go-ipfs/core/commands" + commands "github.com/ipfs/ipfs-banana/core/commands" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 6147a0cbf758..73a73ec1744b 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -12,15 +12,15 @@ import ( "runtime/pprof" "time" - util "github.com/ipfs/go-ipfs/cmd/ipfs/util" - oldcmds "github.com/ipfs/go-ipfs/commands" - core "github.com/ipfs/go-ipfs/core" - corecmds "github.com/ipfs/go-ipfs/core/commands" - corehttp "github.com/ipfs/go-ipfs/core/corehttp" - loader "github.com/ipfs/go-ipfs/plugin/loader" - repo "github.com/ipfs/go-ipfs/repo" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "github.com/ipfs/go-ipfs/tracing" + util "github.com/ipfs/ipfs-banana/cmd/ipfs/util" + oldcmds "github.com/ipfs/ipfs-banana/commands" + core "github.com/ipfs/ipfs-banana/core" + corecmds "github.com/ipfs/ipfs-banana/core/commands" + corehttp "github.com/ipfs/ipfs-banana/core/corehttp" + loader "github.com/ipfs/ipfs-banana/plugin/loader" + repo "github.com/ipfs/ipfs-banana/repo" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" + "github.com/ipfs/ipfs-banana/tracing" "go.opentelemetry.io/otel" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/cmd/ipfs/pinmfs.go b/cmd/ipfs/pinmfs.go index 021b0530b96c..3d5e56c2bdb5 100644 --- a/cmd/ipfs/pinmfs.go +++ b/cmd/ipfs/pinmfs.go @@ -13,8 +13,8 @@ import ( logging "github.com/ipfs/go-log" pinclient "github.com/ipfs/go-pinning-service-http-client" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/core" + config "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/core" ) // mfslog is the logger for remote mfs pinning diff --git a/cmd/ipfs/pinmfs_test.go b/cmd/ipfs/pinmfs_test.go index 2c79c20432cc..686013fb429b 100644 --- a/cmd/ipfs/pinmfs_test.go +++ b/cmd/ipfs/pinmfs_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ipld "github.com/ipfs/go-ipld-format" merkledag "github.com/ipfs/go-merkledag" "github.com/libp2p/go-libp2p-core/host" diff --git a/cmd/ipfswatch/ipfswatch_test.go b/cmd/ipfswatch/ipfswatch_test.go index b5a41c6bc2af..e62cf5cc0408 100644 --- a/cmd/ipfswatch/ipfswatch_test.go +++ b/cmd/ipfswatch/ipfswatch_test.go @@ -6,7 +6,7 @@ package main import ( "testing" - "github.com/ipfs/go-ipfs/thirdparty/assert" + "github.com/ipfs/ipfs-banana/thirdparty/assert" ) func TestIsHidden(t *testing.T) { diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 9ffc6f62ea10..bb6609b02404 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -12,11 +12,11 @@ import ( "path/filepath" "syscall" - commands "github.com/ipfs/go-ipfs/commands" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" - corehttp "github.com/ipfs/go-ipfs/core/corehttp" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + commands "github.com/ipfs/ipfs-banana/commands" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" + corehttp "github.com/ipfs/ipfs-banana/core/corehttp" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" fsnotify "github.com/fsnotify/fsnotify" files "github.com/ipfs/go-ipfs-files" diff --git a/commands/context.go b/commands/context.go index be768f54a123..57352bde592b 100644 --- a/commands/context.go +++ b/commands/context.go @@ -6,12 +6,12 @@ import ( "strings" "time" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" - loader "github.com/ipfs/go-ipfs/plugin/loader" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" + loader "github.com/ipfs/ipfs-banana/plugin/loader" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" logging "github.com/ipfs/go-log" coreiface "github.com/ipfs/interface-go-ipfs-core" options "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/config/experiments.go b/config/experiments.go index dba0ea7139bf..8950e2fb5e84 100644 --- a/config/experiments.go +++ b/config/experiments.go @@ -3,7 +3,7 @@ package config type Experiments struct { FilestoreEnabled bool UrlstoreEnabled bool - ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/go-ipfs/pull/8527 + ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/ipfs-banana/pull/8527 GraphsyncEnabled bool Libp2pStreamMounting bool P2pHttpProxy bool diff --git a/config/gateway.go b/config/gateway.go index 486089b7123a..6a59ccb2dd5c 100644 --- a/config/gateway.go +++ b/config/gateway.go @@ -61,7 +61,7 @@ type Gateway struct { // Setting to 0 will enable fast listings for all directories. FastDirIndexThreshold *OptionalInteger `json:",omitempty"` - // FIXME: Not yet implemented: https://github.com/ipfs/go-ipfs/issues/8059 + // FIXME: Not yet implemented: https://github.com/ipfs/ipfs-banana/issues/8059 APICommands []string // NoFetch configures the gateway to _not_ fetch blocks in response to diff --git a/config/serialize/serialize.go b/config/serialize/serialize.go index e51e92115750..fd940dc7439e 100644 --- a/config/serialize/serialize.go +++ b/config/serialize/serialize.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/ipfs-banana/config" "github.com/facebookgo/atomicfile" ) diff --git a/config/serialize/serialize_test.go b/config/serialize/serialize_test.go index 0c8e12f40c07..0ebb0a0e763d 100644 --- a/config/serialize/serialize_test.go +++ b/config/serialize/serialize_test.go @@ -5,7 +5,7 @@ import ( "runtime" "testing" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) func TestConfig(t *testing.T) { diff --git a/core/builder.go b/core/builder.go index c6bb9919206f..342444ef9415 100644 --- a/core/builder.go +++ b/core/builder.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/node" + "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/node" "github.com/ipfs/go-metrics-interface" "go.uber.org/dig" diff --git a/core/commands/active.go b/core/commands/active.go index 34a2c9b9c8c9..f4b2de80eb31 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -7,7 +7,7 @@ import ( "text/tabwriter" "time" - oldcmds "github.com/ipfs/go-ipfs/commands" + oldcmds "github.com/ipfs/ipfs-banana/commands" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/core/commands/add.go b/core/commands/add.go index 83534493eac4..7fab35acc016 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" "github.com/cheggaaa/pb" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 095d7d5b53dd..1cec3c02f745 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - e "github.com/ipfs/go-ipfs/core/commands/e" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + e "github.com/ipfs/ipfs-banana/core/commands/e" humanize "github.com/dustin/go-humanize" bitswap "github.com/ipfs/go-bitswap" diff --git a/core/commands/block.go b/core/commands/block.go index 92e5f9cb3c9e..3fa1f7045e00 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -8,8 +8,8 @@ import ( files "github.com/ipfs/go-ipfs-files" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/cmdutils" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdutils" cmds "github.com/ipfs/go-ipfs-cmds" options "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index d572e8c079b4..8e66478caa89 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -6,12 +6,12 @@ import ( "io" "sort" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - repo "github.com/ipfs/go-ipfs/repo" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + repo "github.com/ipfs/ipfs-banana/repo" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" peer "github.com/libp2p/go-libp2p-core/peer" ma "github.com/multiformats/go-multiaddr" ) diff --git a/core/commands/cat.go b/core/commands/cat.go index 98a0e41bd2c7..2d7f0434635d 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" "github.com/cheggaaa/pb" "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/cmdenv/env.go b/core/commands/cmdenv/env.go index ecce8327857f..8ed931603872 100644 --- a/core/commands/cmdenv/env.go +++ b/core/commands/cmdenv/env.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/ipfs/go-ipfs/commands" - "github.com/ipfs/go-ipfs/core" + "github.com/ipfs/ipfs-banana/commands" + "github.com/ipfs/ipfs-banana/core" cmds "github.com/ipfs/go-ipfs-cmds" logging "github.com/ipfs/go-log" diff --git a/core/commands/cmdutils/utils.go b/core/commands/cmdutils/utils.go index ebbbca64e46d..91801ddf99f9 100644 --- a/core/commands/cmdutils/utils.go +++ b/core/commands/cmdutils/utils.go @@ -11,7 +11,7 @@ import ( const ( AllowBigBlockOptionName = "allow-big-block" - SoftBlockLimit = 1024 * 1024 // https://github.com/ipfs/go-ipfs/issues/7421#issuecomment-910833499 + SoftBlockLimit = 1024 * 1024 // https://github.com/ipfs/ipfs-banana/issues/7421#issuecomment-910833499 ) var AllowBigBlockOption cmds.Option diff --git a/core/commands/commands.go b/core/commands/commands.go index 27be029c0158..9589db074236 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -1,6 +1,6 @@ // Package commands implements the ipfs command interface // -// Using github.com/ipfs/go-ipfs/commands to define the command line and HTTP +// Using github.com/ipfs/ipfs-banana/commands to define the command line and HTTP // APIs. This is the interface available to folks using IPFS from outside of // the Go language. package commands diff --git a/core/commands/config.go b/core/commands/config.go index 38e14c31da94..1d4383df0e48 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -10,13 +10,13 @@ import ( "os/exec" "strings" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" "github.com/elgris/jsondiff" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) // ConfigUpdateOutput is config profile apply command's output diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index d5d7479f2685..ea0eb9a012b6 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/cmdutils" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdutils" cid "github.com/ipfs/go-cid" cidenc "github.com/ipfs/go-cidutil/cidenc" diff --git a/core/commands/dag/export.go b/core/commands/dag/export.go index 530bf4d57886..e627e35d9ba0 100644 --- a/core/commands/dag/export.go +++ b/core/commands/dag/export.go @@ -11,7 +11,7 @@ import ( "github.com/cheggaaa/pb" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" ipld "github.com/ipfs/go-ipld-format" iface "github.com/ipfs/interface-go-ipfs-core" diff --git a/core/commands/dag/get.go b/core/commands/dag/get.go index 546ba4e5d19d..3a536b9109e8 100644 --- a/core/commands/dag/get.go +++ b/core/commands/dag/get.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" ipldlegacy "github.com/ipfs/go-ipld-legacy" "github.com/ipfs/interface-go-ipfs-core/path" diff --git a/core/commands/dag/import.go b/core/commands/dag/import.go index 77d688ca9ead..fc27c7cdfcdc 100644 --- a/core/commands/dag/import.go +++ b/core/commands/dag/import.go @@ -7,8 +7,8 @@ import ( cid "github.com/ipfs/go-cid" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/cmdutils" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdutils" ipld "github.com/ipfs/go-ipld-format" iface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/commands/dag/put.go b/core/commands/dag/put.go index e741f11124de..852be8d65b08 100644 --- a/core/commands/dag/put.go +++ b/core/commands/dag/put.go @@ -6,8 +6,8 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/cmdutils" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdutils" ipldlegacy "github.com/ipfs/go-ipld-legacy" "github.com/ipld/go-ipld-prime/multicodec" basicnode "github.com/ipld/go-ipld-prime/node/basic" diff --git a/core/commands/dag/resolve.go b/core/commands/dag/resolve.go index 836138368b01..a7f6680b6512 100644 --- a/core/commands/dag/resolve.go +++ b/core/commands/dag/resolve.go @@ -1,7 +1,7 @@ package dagcmd import ( - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" "github.com/ipfs/interface-go-ipfs-core/path" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/dag/stat.go b/core/commands/dag/stat.go index 3e3336f2322a..1b26c9692367 100644 --- a/core/commands/dag/stat.go +++ b/core/commands/dag/stat.go @@ -5,8 +5,8 @@ import ( "io" "os" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/e" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/e" "github.com/ipfs/go-merkledag/traverse" "github.com/ipfs/interface-go-ipfs-core/path" diff --git a/core/commands/dht.go b/core/commands/dht.go index 4379fb0414d0..e3ab2514c6e0 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cid "github.com/ipfs/go-cid" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/dns.go b/core/commands/dns.go index 8fccadf6774a..f6c6e8f247d9 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - ncmd "github.com/ipfs/go-ipfs/core/commands/name" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + ncmd "github.com/ipfs/ipfs-banana/core/commands/name" namesys "github.com/ipfs/go-namesys" nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys" @@ -17,7 +17,7 @@ const ( ) var DNSCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/8607 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/8607 Helptext: cmds.HelpText{ Tagline: "Resolve DNSLink records.", ShortDescription: ` diff --git a/core/commands/files.go b/core/commands/files.go index 4c403f7688af..4acb358a274f 100644 --- a/core/commands/files.go +++ b/core/commands/files.go @@ -11,8 +11,8 @@ import ( "strings" humanize "github.com/dustin/go-humanize" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" bservice "github.com/ipfs/go-blockservice" cid "github.com/ipfs/go-cid" diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 03024eb5fa27..9f5728d4de6f 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -8,9 +8,9 @@ import ( filestore "github.com/ipfs/go-filestore" cmds "github.com/ipfs/go-ipfs-cmds" - core "github.com/ipfs/go-ipfs/core" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - e "github.com/ipfs/go-ipfs/core/commands/e" + core "github.com/ipfs/ipfs-banana/core" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + e "github.com/ipfs/ipfs-banana/core/commands/e" "github.com/ipfs/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 65ab46aa57cd..b94347ef49cb 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/e" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/e" "github.com/cheggaaa/pb" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/id.go b/core/commands/id.go index 8920c90921fa..5d146ee4c65e 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -9,12 +9,12 @@ import ( "sort" "strings" - version "github.com/ipfs/go-ipfs" - core "github.com/ipfs/go-ipfs/core" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + version "github.com/ipfs/ipfs-banana" + core "github.com/ipfs/ipfs-banana/core" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" - ke "github.com/ipfs/go-ipfs/core/commands/keyencode" + ke "github.com/ipfs/ipfs-banana/core/commands/keyencode" ic "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/commands/keystore.go b/core/commands/keystore.go index 4f7ca4af80f2..2325bd4f075c 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -15,13 +15,13 @@ import ( cmds "github.com/ipfs/go-ipfs-cmds" keystore "github.com/ipfs/go-ipfs-keystore" - oldcmds "github.com/ipfs/go-ipfs/commands" - config "github.com/ipfs/go-ipfs/config" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/e" - ke "github.com/ipfs/go-ipfs/core/commands/keyencode" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - migrations "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" + oldcmds "github.com/ipfs/ipfs-banana/commands" + config "github.com/ipfs/ipfs-banana/config" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/e" + ke "github.com/ipfs/ipfs-banana/core/commands/keyencode" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" + migrations "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" options "github.com/ipfs/interface-go-ipfs-core/options" "github.com/libp2p/go-libp2p-core/crypto" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/commands/ls.go b/core/commands/ls.go index 1a7b0c3fc175..8863a407d12d 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -7,7 +7,7 @@ import ( "sort" "text/tabwriter" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" unixfs "github.com/ipfs/go-unixfs" diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index bde049c3411a..79eb89e6b3c0 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -7,12 +7,12 @@ import ( "fmt" "io" - oldcmds "github.com/ipfs/go-ipfs/commands" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - nodeMount "github.com/ipfs/go-ipfs/fuse/node" + oldcmds "github.com/ipfs/ipfs-banana/commands" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + nodeMount "github.com/ipfs/ipfs-banana/fuse/node" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) const ( diff --git a/core/commands/multibase.go b/core/commands/multibase.go index 83f3ac2b4c60..826355d9601b 100644 --- a/core/commands/multibase.go +++ b/core/commands/multibase.go @@ -7,7 +7,7 @@ import ( "strings" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" mbase "github.com/multiformats/go-multibase" ) diff --git a/core/commands/name/ipns.go b/core/commands/name/ipns.go index 885c469247a9..92b244bc42ca 100644 --- a/core/commands/name/ipns.go +++ b/core/commands/name/ipns.go @@ -7,7 +7,7 @@ import ( "strings" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" namesys "github.com/ipfs/go-namesys" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/name/ipnsps.go b/core/commands/name/ipnsps.go index 949ea43d5e85..5f9b15bca5fa 100644 --- a/core/commands/name/ipnsps.go +++ b/core/commands/name/ipnsps.go @@ -6,8 +6,8 @@ import ( "strings" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - ke "github.com/ipfs/go-ipfs/core/commands/keyencode" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + ke "github.com/ipfs/ipfs-banana/core/commands/keyencode" "github.com/libp2p/go-libp2p-core/peer" record "github.com/libp2p/go-libp2p-record" ) diff --git a/core/commands/name/publish.go b/core/commands/name/publish.go index e220efa7fc75..577802475d28 100644 --- a/core/commands/name/publish.go +++ b/core/commands/name/publish.go @@ -6,10 +6,10 @@ import ( "io" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" - ke "github.com/ipfs/go-ipfs/core/commands/keyencode" + ke "github.com/ipfs/ipfs-banana/core/commands/keyencode" iface "github.com/ipfs/interface-go-ipfs-core" options "github.com/ipfs/interface-go-ipfs-core/options" path "github.com/ipfs/interface-go-ipfs-core/path" diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index 54727cd287f0..985f087c84dc 100644 --- a/core/commands/object/diff.go +++ b/core/commands/object/diff.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-merkledag/dagutils" path "github.com/ipfs/interface-go-ipfs-core/path" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" ) const ( @@ -20,7 +20,7 @@ type Changes struct { } var ObjectDiffCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Display the diff between two IPFS objects.", ShortDescription: ` diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 00f2f44ce3d0..0577b762d74b 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -9,7 +9,7 @@ import ( "text/tabwriter" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" humanize "github.com/dustin/go-humanize" "github.com/ipfs/go-cid" @@ -47,7 +47,7 @@ const ( ) var ObjectCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated commands to interact with dag-pb objects. Use 'dag' or 'files' instead.", ShortDescription: ` @@ -69,7 +69,7 @@ directly. Deprecated, use more modern 'ipfs dag' and 'ipfs files' instead.`, // ObjectDataCmd object data command var ObjectDataCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to read the raw bytes of a dag-pb object: use 'dag get' instead.", ShortDescription: ` @@ -109,7 +109,7 @@ is the raw data of the object. // ObjectLinksCmd object links command var ObjectLinksCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to output links in the specified dag-pb object: use 'dag get' instead.", ShortDescription: ` @@ -184,7 +184,7 @@ multihash. Provided for legacy reasons. Use 'ipfs dag get' instead. // ObjectGetCmd object get command var ObjectGetCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to get and serialize the dag-pb node. Use 'dag get' instead", ShortDescription: ` @@ -276,7 +276,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs dag get' instead. // ObjectStatCmd object stat command var ObjectStatCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to read stats for the dag-pb node. Use 'files stat' instead.", ShortDescription: ` @@ -376,7 +376,7 @@ DEPRECATED: Provided for legacy reasons. Modern replacements: // ObjectPutCmd object put command var ObjectPutCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to store input as a DAG object. Use 'dag put' instead.", ShortDescription: ` @@ -456,7 +456,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs dag put' instead. // ObjectNewCmd object new command var ObjectNewCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to create a new dag-pb object from a template.", ShortDescription: ` diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index 6843b2267656..92c63d791293 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -5,15 +5,15 @@ import ( "io" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/cmdutils" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdutils" "github.com/ipfs/interface-go-ipfs-core/options" "github.com/ipfs/interface-go-ipfs-core/path" ) var ObjectPatchCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to create a new merkledag object based on an existing one. Use MFS with 'files cp|rm' instead.", ShortDescription: ` @@ -49,7 +49,7 @@ For modern use cases, use MFS with 'files' commands: 'ipfs files --help'. } var patchAppendDataCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to append data to the data segment of a DAG node.", ShortDescription: ` @@ -104,7 +104,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs add' or 'ipfs files' inste } var patchSetDataCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to set the data field of dag-pb object.", ShortDescription: ` @@ -155,7 +155,7 @@ DEPRECATED and provided for legacy reasons. Use 'files cp' and 'dag put' instead } var patchRmLinkCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to remove a link from dag-pb object.", ShortDescription: ` @@ -202,7 +202,7 @@ const ( ) var patchAddLinkCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to add a link to a given dag-pb.", ShortDescription: ` diff --git a/core/commands/p2p.go b/core/commands/p2p.go index e9c32626bc4c..cd017c99c46c 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -10,9 +10,9 @@ import ( "text/tabwriter" "time" - core "github.com/ipfs/go-ipfs/core" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - p2p "github.com/ipfs/go-ipfs/p2p" + core "github.com/ipfs/ipfs-banana/core" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + p2p "github.com/ipfs/ipfs-banana/p2p" cmds "github.com/ipfs/go-ipfs-cmds" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/commands/pin/pin.go b/core/commands/pin/pin.go index 0344932f6525..c57a7bdd8398 100644 --- a/core/commands/pin/pin.go +++ b/core/commands/pin/pin.go @@ -19,9 +19,9 @@ import ( options "github.com/ipfs/interface-go-ipfs-core/options" "github.com/ipfs/interface-go-ipfs-core/path" - core "github.com/ipfs/go-ipfs/core" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - e "github.com/ipfs/go-ipfs/core/commands/e" + core "github.com/ipfs/ipfs-banana/core" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + e "github.com/ipfs/ipfs-banana/core/commands/e" ) var PinCmd = &cmds.Command{ diff --git a/core/commands/pin/remotepin.go b/core/commands/pin/remotepin.go index 495a14003675..a491979c44b3 100644 --- a/core/commands/pin/remotepin.go +++ b/core/commands/pin/remotepin.go @@ -17,9 +17,9 @@ import ( cid "github.com/ipfs/go-cid" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + config "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" logging "github.com/ipfs/go-log" pinclient "github.com/ipfs/go-pinning-service-http-client" path "github.com/ipfs/interface-go-ipfs-core/path" @@ -761,7 +761,7 @@ func normalizeEndpoint(endpoint string) (string, error) { return "", fmt.Errorf("service endpoint must be a valid HTTP URL") } - // cleanup trailing and duplicate slashes (https://github.com/ipfs/go-ipfs/issues/7826) + // cleanup trailing and duplicate slashes (https://github.com/ipfs/ipfs-banana/issues/7826) uri.Path = gopath.Clean(uri.Path) uri.Path = strings.TrimSuffix(uri.Path, ".") uri.Path = strings.TrimSuffix(uri.Path, "/") diff --git a/core/commands/ping.go b/core/commands/ping.go index 3c48018a7a7b..475d6dfa48fd 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/commands/profile.go b/core/commands/profile.go index a5567fc814bb..82256d3d56ba 100644 --- a/core/commands/profile.go +++ b/core/commands/profile.go @@ -9,8 +9,8 @@ import ( "time" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/e" - "github.com/ipfs/go-ipfs/profile" + "github.com/ipfs/ipfs-banana/core/commands/e" + "github.com/ipfs/ipfs-banana/profile" ) // time format that works in filenames on windows. @@ -41,7 +41,7 @@ To aid in debugging, this command also attempts to include a copy of the running go-ipfs binary. Profiles can be examined using 'go tool pprof', some tips can be found at -https://github.com/ipfs/go-ipfs/blob/master/docs/debug-guide.md. +https://github.com/ipfs/ipfs-banana/blob/master/docs/debug-guide.md. Privacy Notice: diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index e36b3b185b4f..0a4d4ad17c09 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -8,7 +8,7 @@ import ( "net/http" "sort" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" mbase "github.com/multiformats/go-multibase" "github.com/pkg/errors" @@ -337,7 +337,7 @@ TOPIC AND DATA ENCODING // TODO: move to cmdenv? // Encode binary data to be passed as multibase string in URL arguments. -// (avoiding issues described in https://github.com/ipfs/go-ipfs/issues/7939) +// (avoiding issues described in https://github.com/ipfs/ipfs-banana/issues/7939) func urlArgsEncoder(req *cmds.Request, env cmds.Environment) error { encoder, _ := mbase.EncoderByName("base64url") for n, arg := range req.Arguments { @@ -347,7 +347,7 @@ func urlArgsEncoder(req *cmds.Request, env cmds.Environment) error { } // Decode binary data passed as multibase string in URL arguments. -// (avoiding issues described in https://github.com/ipfs/go-ipfs/issues/7939) +// (avoiding issues described in https://github.com/ipfs/ipfs-banana/issues/7939) func urlArgsDecoder(req *cmds.Request, env cmds.Environment) error { for n, arg := range req.Arguments { encoding, data, err := mbase.Decode(arg) @@ -356,7 +356,7 @@ func urlArgsDecoder(req *cmds.Request, env cmds.Environment) error { } // Enforce URL-safe encoding is used for data passed via URL arguments - // - without this we get data corruption similar to https://github.com/ipfs/go-ipfs/issues/7939 + // - without this we get data corruption similar to https://github.com/ipfs/ipfs-banana/issues/7939 // - we can't just deny base64, because there may be other bases that // are not URL-safe – better to force base64url which is known to be // safe in URL context diff --git a/core/commands/refs.go b/core/commands/refs.go index 84dcdb25b52c..e9d44c18e303 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -7,7 +7,7 @@ import ( "io" "strings" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cid "github.com/ipfs/go-cid" cidenc "github.com/ipfs/go-cidutil/cidenc" diff --git a/core/commands/repo.go b/core/commands/repo.go index 3824b972e765..e9c5a0cc7574 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -11,12 +11,12 @@ import ( "sync" "text/tabwriter" - oldcmds "github.com/ipfs/go-ipfs/commands" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - corerepo "github.com/ipfs/go-ipfs/core/corerepo" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher" + oldcmds "github.com/ipfs/ipfs-banana/commands" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + corerepo "github.com/ipfs/ipfs-banana/core/corerepo" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations/ipfsfetcher" humanize "github.com/dustin/go-humanize" cid "github.com/ipfs/go-cid" @@ -227,7 +227,7 @@ Version string The repo version. } var repoFsckCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/6435 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/6435 Helptext: cmds.HelpText{ Tagline: "Remove repo lockfiles.", ShortDescription: ` diff --git a/core/commands/resolve.go b/core/commands/resolve.go index fb87d1c02aa7..c5608d7d18d1 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -7,8 +7,8 @@ import ( "strings" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - ncmd "github.com/ipfs/go-ipfs/core/commands/name" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + ncmd "github.com/ipfs/ipfs-banana/core/commands/name" ns "github.com/ipfs/go-namesys" cidenc "github.com/ipfs/go-cidutil/cidenc" diff --git a/core/commands/root.go b/core/commands/root.go index 87bc3fd6f5d7..1fcb5416c031 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -3,12 +3,12 @@ package commands import ( "errors" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - dag "github.com/ipfs/go-ipfs/core/commands/dag" - name "github.com/ipfs/go-ipfs/core/commands/name" - ocmd "github.com/ipfs/go-ipfs/core/commands/object" - "github.com/ipfs/go-ipfs/core/commands/pin" - unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + dag "github.com/ipfs/ipfs-banana/core/commands/dag" + name "github.com/ipfs/ipfs-banana/core/commands/name" + ocmd "github.com/ipfs/ipfs-banana/core/commands/object" + "github.com/ipfs/ipfs-banana/core/commands/pin" + unixfs "github.com/ipfs/ipfs-banana/core/commands/unixfs" cmds "github.com/ipfs/go-ipfs-cmds" logging "github.com/ipfs/go-log" diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go index 4d4adad03d7c..6d38b613e01c 100644 --- a/core/commands/shutdown.go +++ b/core/commands/shutdown.go @@ -2,7 +2,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs-cmds" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" ) var daemonShutdownCmd = &cmds.Command{ diff --git a/core/commands/stat.go b/core/commands/stat.go index e38b5b31b34a..08d7546703f1 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -6,7 +6,7 @@ import ( "os" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" humanize "github.com/dustin/go-humanize" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/stat_dht.go b/core/commands/stat_dht.go index c76fce2c05e0..30bc6ff51736 100644 --- a/core/commands/stat_dht.go +++ b/core/commands/stat_dht.go @@ -6,7 +6,7 @@ import ( "text/tabwriter" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" "github.com/libp2p/go-libp2p-core/network" diff --git a/core/commands/stat_provide.go b/core/commands/stat_provide.go index 4224efcafc0b..c4c0a72cfc5b 100644 --- a/core/commands/stat_provide.go +++ b/core/commands/stat_provide.go @@ -8,7 +8,7 @@ import ( humanize "github.com/dustin/go-humanize" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" "github.com/ipfs/go-ipfs-provider/batched" ) diff --git a/core/commands/swarm.go b/core/commands/swarm.go index d6a3e8d696d1..a97db32b5165 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -13,12 +13,12 @@ import ( "time" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/commands" - "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/commands" + "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" cmds "github.com/ipfs/go-ipfs-cmds" inet "github.com/libp2p/go-libp2p-core/network" diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 9ab2578b25fb..6c46f5554bfc 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -5,9 +5,9 @@ import ( "path" "runtime" - version "github.com/ipfs/go-ipfs" - "github.com/ipfs/go-ipfs/core" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + version "github.com/ipfs/ipfs-banana" + "github.com/ipfs/ipfs-banana/core" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" manet "github.com/multiformats/go-multiaddr/net" diff --git a/core/commands/tar.go b/core/commands/tar.go index 4dcb22be8b29..0a1adeebc8c6 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -5,15 +5,15 @@ import ( "io" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - tar "github.com/ipfs/go-ipfs/tar" + "github.com/ipfs/ipfs-banana/core/commands/cmdenv" + tar "github.com/ipfs/ipfs-banana/tar" dag "github.com/ipfs/go-merkledag" path "github.com/ipfs/interface-go-ipfs-core/path" ) var TarCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7951 Helptext: cmds.HelpText{ Tagline: "Utility functions for tar files in ipfs.", }, @@ -25,7 +25,7 @@ var TarCmd = &cmds.Command{ } var tarAddCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7951 Helptext: cmds.HelpText{ Tagline: "Import a tar file into IPFS.", ShortDescription: ` @@ -76,7 +76,7 @@ represent it. } var tarCatCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/issues/7951 Helptext: cmds.HelpText{ Tagline: "Export a tar file from IPFS.", ShortDescription: ` diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index ac012b04fe4d..0dbc596eebd4 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -6,7 +6,7 @@ import ( "sort" "text/tabwriter" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" merkledag "github.com/ipfs/go-merkledag" @@ -33,7 +33,7 @@ type LsOutput struct { } var LsCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/pull/7755 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/pull/7755 Helptext: cmds.HelpText{ Tagline: "List directory contents for Unix filesystem objects. Deprecated: Use 'ipfs ls' and 'ipfs files ls' instead.", ShortDescription: ` diff --git a/core/commands/unixfs/unixfs.go b/core/commands/unixfs/unixfs.go index cb5c8ddaf322..8a30550ace95 100644 --- a/core/commands/unixfs/unixfs.go +++ b/core/commands/unixfs/unixfs.go @@ -5,7 +5,7 @@ import ( ) var UnixFSCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/pull/7755 + Status: cmds.Deprecated, // https://github.com/ipfs/ipfs-banana/pull/7755 Helptext: cmds.HelpText{ Tagline: "Interact with IPFS objects representing Unix filesystems.", ShortDescription: ` diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go index 0b7dcbc5f50f..a3faa8294565 100644 --- a/core/commands/urlstore.go +++ b/core/commands/urlstore.go @@ -6,7 +6,7 @@ import ( "net/url" filestore "github.com/ipfs/go-filestore" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/ipfs-banana/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" files "github.com/ipfs/go-ipfs-files" diff --git a/core/commands/version.go b/core/commands/version.go index 93ec5dd87a84..cff75c4d7b53 100644 --- a/core/commands/version.go +++ b/core/commands/version.go @@ -6,7 +6,7 @@ import ( "io" "runtime/debug" - version "github.com/ipfs/go-ipfs" + version "github.com/ipfs/ipfs-banana" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/core/core.go b/core/core.go index 1a09b85e83f3..150bda313ac2 100644 --- a/core/core.go +++ b/core/core.go @@ -43,13 +43,13 @@ import ( ma "github.com/multiformats/go-multiaddr" madns "github.com/multiformats/go-multiaddr-dns" - "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/node" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/fuse/mount" - "github.com/ipfs/go-ipfs/p2p" - "github.com/ipfs/go-ipfs/peering" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/node" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/fuse/mount" + "github.com/ipfs/ipfs-banana/p2p" + "github.com/ipfs/ipfs-banana/peering" + "github.com/ipfs/ipfs-banana/repo" "github.com/ipfs/go-namesys" ipnsrp "github.com/ipfs/go-namesys/republisher" ) diff --git a/core/core_test.go b/core/core_test.go index e1563789e73d..0c6e08ce8d72 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -5,11 +5,11 @@ import ( context "context" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/repo" datastore "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) func TestInitialization(t *testing.T) { diff --git a/core/coreapi/block.go b/core/coreapi/block.go index 565206908337..e976cdb1cb83 100644 --- a/core/coreapi/block.go +++ b/core/coreapi/block.go @@ -16,8 +16,8 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - util "github.com/ipfs/go-ipfs/blocks/blockstoreutil" - "github.com/ipfs/go-ipfs/tracing" + util "github.com/ipfs/ipfs-banana/blocks/blockstoreutil" + "github.com/ipfs/ipfs-banana/tracing" ) type BlockAPI CoreAPI diff --git a/core/coreapi/coreapi.go b/core/coreapi/coreapi.go index 3d31abaabc2f..dfdce126d562 100644 --- a/core/coreapi/coreapi.go +++ b/core/coreapi/coreapi.go @@ -39,9 +39,9 @@ import ( record "github.com/libp2p/go-libp2p-record" madns "github.com/multiformats/go-multiaddr-dns" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/node" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/node" + "github.com/ipfs/ipfs-banana/repo" "github.com/ipfs/go-namesys" ) diff --git a/core/coreapi/dag.go b/core/coreapi/dag.go index 696c5bab76c2..9f3ca0169cd6 100644 --- a/core/coreapi/dag.go +++ b/core/coreapi/dag.go @@ -5,7 +5,7 @@ import ( cid "github.com/ipfs/go-cid" pin "github.com/ipfs/go-ipfs-pinner" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipld "github.com/ipfs/go-ipld-format" dag "github.com/ipfs/go-merkledag" "go.opentelemetry.io/otel/attribute" diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go index c196aba9bd83..d0569b17db02 100644 --- a/core/coreapi/dht.go +++ b/core/coreapi/dht.go @@ -9,7 +9,7 @@ import ( cidutil "github.com/ipfs/go-cidutil" blockstore "github.com/ipfs/go-ipfs-blockstore" offline "github.com/ipfs/go-ipfs-exchange-offline" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" dag "github.com/ipfs/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/coreapi/key.go b/core/coreapi/key.go index 1468e6c0c5a3..80ba10f71783 100644 --- a/core/coreapi/key.go +++ b/core/coreapi/key.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipfspath "github.com/ipfs/go-path" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/coreapi/name.go b/core/coreapi/name.go index e39c05d0f5f7..1324005a9dee 100644 --- a/core/coreapi/name.go +++ b/core/coreapi/name.go @@ -7,7 +7,7 @@ import ( "time" keystore "github.com/ipfs/go-ipfs-keystore" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" "github.com/ipfs/go-namesys" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/core/coreapi/object.go b/core/coreapi/object.go index 8c3a2e0aa0ca..3faa263ca35d 100644 --- a/core/coreapi/object.go +++ b/core/coreapi/object.go @@ -13,7 +13,7 @@ import ( cid "github.com/ipfs/go-cid" pin "github.com/ipfs/go-ipfs-pinner" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipld "github.com/ipfs/go-ipld-format" dag "github.com/ipfs/go-merkledag" "github.com/ipfs/go-merkledag/dagutils" diff --git a/core/coreapi/path.go b/core/coreapi/path.go index 5f2b41007897..751f935dada9 100644 --- a/core/coreapi/path.go +++ b/core/coreapi/path.go @@ -5,7 +5,7 @@ import ( "fmt" gopath "path" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" "github.com/ipfs/go-namesys/resolve" "go.opentelemetry.io/otel/attribute" diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go index 51667c4b71f1..c1942b50bda7 100644 --- a/core/coreapi/pin.go +++ b/core/coreapi/pin.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-cid" offline "github.com/ipfs/go-ipfs-exchange-offline" pin "github.com/ipfs/go-ipfs-pinner" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" "github.com/ipfs/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/coreapi/pubsub.go b/core/coreapi/pubsub.go index 99658b599522..d1e909d6f1c4 100644 --- a/core/coreapi/pubsub.go +++ b/core/coreapi/pubsub.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/coreapi/swarm.go b/core/coreapi/swarm.go index 2aea3152ca19..991192af305a 100644 --- a/core/coreapi/swarm.go +++ b/core/coreapi/swarm.go @@ -5,7 +5,7 @@ import ( "sort" "time" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" inet "github.com/libp2p/go-libp2p-core/network" peer "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go index b8eed6102d9f..8c5c6dcc76c4 100644 --- a/core/coreapi/test/api_test.go +++ b/core/coreapi/test/api_test.go @@ -10,16 +10,16 @@ import ( "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs-keystore" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/coreapi" - mock "github.com/ipfs/go-ipfs/core/mock" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/coreapi" + mock "github.com/ipfs/ipfs-banana/core/mock" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/repo" "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/ipfs-banana/config" coreiface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/tests" "github.com/libp2p/go-libp2p-core/crypto" diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go index b4e1bbc3ee5b..cc263d4feec8 100644 --- a/core/coreapi/unixfs.go +++ b/core/coreapi/unixfs.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-ipfs/core/coreunix" + "github.com/ipfs/ipfs-banana/core/coreunix" blockservice "github.com/ipfs/go-blockservice" cid "github.com/ipfs/go-cid" @@ -96,7 +96,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options //} if settings.NoCopy && !(cfg.Experimental.FilestoreEnabled || cfg.Experimental.UrlstoreEnabled) { - return nil, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#ipfs-filestore") + return nil, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/ipfs-banana/blob/master/docs/experimental-features.md#ipfs-filestore") } addblockstore := api.blockstore diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 14b503ff528a..eb9358c18913 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -9,14 +9,14 @@ import ( "strconv" "strings" - version "github.com/ipfs/go-ipfs" - oldcmds "github.com/ipfs/go-ipfs/commands" - "github.com/ipfs/go-ipfs/core" - corecommands "github.com/ipfs/go-ipfs/core/commands" + version "github.com/ipfs/ipfs-banana" + oldcmds "github.com/ipfs/ipfs-banana/commands" + "github.com/ipfs/ipfs-banana/core" + corecommands "github.com/ipfs/ipfs-banana/core/commands" cmds "github.com/ipfs/go-ipfs-cmds" cmdsHttp "github.com/ipfs/go-ipfs-cmds/http" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" path "github.com/ipfs/go-path" ) diff --git a/core/corehttp/corehttp.go b/core/corehttp/corehttp.go index 143327149c31..c3992b41288f 100644 --- a/core/corehttp/corehttp.go +++ b/core/corehttp/corehttp.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" logging "github.com/ipfs/go-log" "github.com/jbenet/goprocess" periodicproc "github.com/jbenet/goprocess/periodic" diff --git a/core/corehttp/gateway.go b/core/corehttp/gateway.go index a4ae5383179a..09f192911cca 100644 --- a/core/corehttp/gateway.go +++ b/core/corehttp/gateway.go @@ -6,9 +6,9 @@ import ( "net/http" "sort" - version "github.com/ipfs/go-ipfs" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" + version "github.com/ipfs/ipfs-banana" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" options "github.com/ipfs/interface-go-ipfs-core/options" diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go index f32fac54ecd6..38b7a5a7be2a 100644 --- a/core/corehttp/gateway_handler.go +++ b/core/corehttp/gateway_handler.go @@ -189,7 +189,7 @@ func newGatewaySummaryMetric(name string, help string) *prometheus.SummaryVec { func newGatewayHistogramMetric(name string, help string) *prometheus.HistogramVec { // We can add buckets as a parameter in the future, but for now using static defaults - // suggested in https://github.com/ipfs/go-ipfs/issues/8441 + // suggested in https://github.com/ipfs/ipfs-banana/issues/8441 defaultBuckets := []float64{0.05, 0.1, 0.25, 0.5, 1, 2, 5, 10, 30, 60} histogramMetric := prometheus.NewHistogramVec( prometheus.HistogramOpts{ @@ -666,11 +666,11 @@ func addCacheControlHeaders(w http.ResponseWriter, r *http.Request, contentPath // mutable namespaces such as /ipns/ can't be cached forever /* For now we set Last-Modified to Now() to leverage caching heuristics built into modern browsers: - * https://github.com/ipfs/go-ipfs/pull/8074#pullrequestreview-645196768 + * https://github.com/ipfs/ipfs-banana/pull/8074#pullrequestreview-645196768 * but we should not set it to fake values and use Cache-Control based on TTL instead */ modtime = time.Now() - // TODO: set Cache-Control based on TTL of IPNS/DNSLink: https://github.com/ipfs/go-ipfs/issues/1818#issuecomment-1015849462 + // TODO: set Cache-Control based on TTL of IPNS/DNSLink: https://github.com/ipfs/ipfs-banana/issues/1818#issuecomment-1015849462 // TODO: set Last-Modified based on /ipns/ publishing timestamp? } else { // immutable! CACHE ALL THE THINGS, FOREVER! wolololol @@ -679,7 +679,7 @@ func addCacheControlHeaders(w http.ResponseWriter, r *http.Request, contentPath // Set modtime to 'zero time' to disable Last-Modified header (superseded by Cache-Control) modtime = noModtime - // TODO: set Last-Modified? - TBD - /ipfs/ modification metadata is present in unixfs 1.5 https://github.com/ipfs/go-ipfs/issues/6920? + // TODO: set Last-Modified? - TBD - /ipfs/ modification metadata is present in unixfs 1.5 https://github.com/ipfs/ipfs-banana/issues/6920? } return modtime @@ -874,7 +874,7 @@ func getEtag(r *http.Request, cid cid.Cid) string { // Etag: "cid.foo" (gives us nice compression together with Content-Disposition in block (raw) and car responses) suffix = `.` + f + suffix } - // TODO: include selector suffix when https://github.com/ipfs/go-ipfs/issues/8769 lands + // TODO: include selector suffix when https://github.com/ipfs/ipfs-banana/issues/8769 lands return prefix + cid.String() + suffix } @@ -957,10 +957,10 @@ func debugStr(path string) string { } func handleUnsupportedHeaders(r *http.Request) (err *requestError) { - // X-Ipfs-Gateway-Prefix was removed (https://github.com/ipfs/go-ipfs/issues/7702) + // X-Ipfs-Gateway-Prefix was removed (https://github.com/ipfs/ipfs-banana/issues/7702) // TODO: remove this after go-ipfs 0.13 ships if prfx := r.Header.Get("X-Ipfs-Gateway-Prefix"); prfx != "" { - err := fmt.Errorf("X-Ipfs-Gateway-Prefix support was removed: https://github.com/ipfs/go-ipfs/issues/7702") + err := fmt.Errorf("X-Ipfs-Gateway-Prefix support was removed: https://github.com/ipfs/ipfs-banana/issues/7702") return newRequestError("unsupported HTTP header", err, http.StatusBadRequest) } return nil @@ -996,7 +996,7 @@ func handleProtocolHandlerRedirect(w http.ResponseWriter, r *http.Request, logge } // Disallow Service Worker registration on namespace roots -// https://github.com/ipfs/go-ipfs/issues/4025 +// https://github.com/ipfs/ipfs-banana/issues/4025 func handleServiceWorkerRegistration(r *http.Request) (err *requestError) { if r.Header.Get("Service-Worker") == "script" { matched, _ := regexp.MatchString(`^/ip[fn]s/[^/]+$`, r.URL.Path) diff --git a/core/corehttp/gateway_handler_block.go b/core/corehttp/gateway_handler_block.go index 8d6ce0f36863..6aa9d35423d2 100644 --- a/core/corehttp/gateway_handler_block.go +++ b/core/corehttp/gateway_handler_block.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/core/corehttp/gateway_handler_car.go b/core/corehttp/gateway_handler_car.go index 1958088706e0..443d01a803de 100644 --- a/core/corehttp/gateway_handler_car.go +++ b/core/corehttp/gateway_handler_car.go @@ -8,7 +8,7 @@ import ( blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" ipath "github.com/ipfs/interface-go-ipfs-core/path" gocar "github.com/ipld/go-car" @@ -51,7 +51,7 @@ func (i *gatewayHandler) serveCAR(ctx context.Context, w http.ResponseWriter, r // Make it clear we don't support range-requests over a car stream // Partial downloads and resumes should be handled using - // IPLD selectors: https://github.com/ipfs/go-ipfs/issues/8769 + // IPLD selectors: https://github.com/ipfs/ipfs-banana/issues/8769 w.Header().Set("Accept-Ranges", "none") // Explicit Cache-Control to ensure fresh stream on retry. @@ -64,7 +64,7 @@ func (i *gatewayHandler) serveCAR(ctx context.Context, w http.ResponseWriter, r // Same go-car settings as dag.export command store := dagStore{dag: i.api.Dag(), ctx: ctx} - // TODO: support selectors passed as request param: https://github.com/ipfs/go-ipfs/issues/8769 + // TODO: support selectors passed as request param: https://github.com/ipfs/ipfs-banana/issues/8769 dag := gocar.Dag{Root: rootCid, Selector: selectorparse.CommonSelector_ExploreAllRecursively} car := gocar.NewSelectiveCar(ctx, store, []gocar.Dag{dag}, gocar.TraverseLinksOnlyOnce()) diff --git a/core/corehttp/gateway_handler_unixfs.go b/core/corehttp/gateway_handler_unixfs.go index b318a641a097..d774c5e37664 100644 --- a/core/corehttp/gateway_handler_unixfs.go +++ b/core/corehttp/gateway_handler_unixfs.go @@ -8,7 +8,7 @@ import ( "time" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/core/corehttp/gateway_handler_unixfs_dir.go b/core/corehttp/gateway_handler_unixfs_dir.go index 1e059200a3b2..3695cf571bdb 100644 --- a/core/corehttp/gateway_handler_unixfs_dir.go +++ b/core/corehttp/gateway_handler_unixfs_dir.go @@ -11,8 +11,8 @@ import ( "github.com/dustin/go-humanize" cid "github.com/ipfs/go-cid" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/assets" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/assets" + "github.com/ipfs/ipfs-banana/tracing" path "github.com/ipfs/go-path" "github.com/ipfs/go-path/resolver" options "github.com/ipfs/interface-go-ipfs-core/options" @@ -81,7 +81,7 @@ func (i *gatewayHandler) serveDirectory(ctx context.Context, w http.ResponseWrit } // See statusResponseWriter.WriteHeader - // and https://github.com/ipfs/go-ipfs/issues/7164 + // and https://github.com/ipfs/ipfs-banana/issues/7164 // Note: this needs to occur before listingTemplate.Execute otherwise we get // superfluous response.WriteHeader call from prometheus/client_golang if w.Header().Get("Location") != "" { @@ -146,7 +146,7 @@ func (i *gatewayHandler) serveDirectory(ctx context.Context, w http.ResponseWrit } // construct the correct back link - // https://github.com/ipfs/go-ipfs/issues/1365 + // https://github.com/ipfs/ipfs-banana/issues/1365 var backLink string = originalUrlPath // don't go further up than /ipfs/$hash/ diff --git a/core/corehttp/gateway_handler_unixfs_file.go b/core/corehttp/gateway_handler_unixfs_file.go index 1852705fd086..0ba7e035af6d 100644 --- a/core/corehttp/gateway_handler_unixfs_file.go +++ b/core/corehttp/gateway_handler_unixfs_file.go @@ -12,7 +12,7 @@ import ( "github.com/gabriel-vasile/mimetype" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" @@ -54,7 +54,7 @@ func (i *gatewayHandler) serveFile(ctx context.Context, w http.ResponseWriter, r ctype = mime.TypeByExtension(gopath.Ext(name)) if ctype == "" { // uses https://github.com/gabriel-vasile/mimetype library to determine the content type. - // Fixes https://github.com/ipfs/go-ipfs/issues/7252 + // Fixes https://github.com/ipfs/ipfs-banana/issues/7252 mimeType, err := mimetype.DetectReader(content) if err != nil { http.Error(w, fmt.Sprintf("cannot detect content-type: %s", err.Error()), http.StatusInternalServerError) @@ -71,7 +71,7 @@ func (i *gatewayHandler) serveFile(ctx context.Context, w http.ResponseWriter, r // Strip the encoding from the HTML Content-Type header and let the // browser figure it out. // - // Fixes https://github.com/ipfs/go-ipfs/issues/2203 + // Fixes https://github.com/ipfs/ipfs-banana/issues/2203 if strings.HasPrefix(ctype, "text/html;") { ctype = "text/html" } diff --git a/core/corehttp/gateway_indexPage.go b/core/corehttp/gateway_indexPage.go index 6cc548cdc4dd..f00be26c61f9 100644 --- a/core/corehttp/gateway_indexPage.go +++ b/core/corehttp/gateway_indexPage.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "github.com/ipfs/go-ipfs/assets" + "github.com/ipfs/ipfs-banana/assets" ipfspath "github.com/ipfs/go-path" ) diff --git a/core/corehttp/gateway_test.go b/core/corehttp/gateway_test.go index 303e4a1ac111..44bd0c892369 100644 --- a/core/corehttp/gateway_test.go +++ b/core/corehttp/gateway_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - version "github.com/ipfs/go-ipfs" - core "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/coreapi" - repo "github.com/ipfs/go-ipfs/repo" + version "github.com/ipfs/ipfs-banana" + core "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/coreapi" + repo "github.com/ipfs/ipfs-banana/repo" namesys "github.com/ipfs/go-namesys" datastore "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" files "github.com/ipfs/go-ipfs-files" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" path "github.com/ipfs/go-path" iface "github.com/ipfs/interface-go-ipfs-core" nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys" diff --git a/core/corehttp/hostname.go b/core/corehttp/hostname.go index 93dde67ab28d..e146c169e46f 100644 --- a/core/corehttp/hostname.go +++ b/core/corehttp/hostname.go @@ -10,15 +10,15 @@ import ( "strings" cid "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" namesys "github.com/ipfs/go-namesys" "github.com/libp2p/go-libp2p-core/peer" dns "github.com/miekg/dns" mbase "github.com/multiformats/go-multibase" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" iface "github.com/ipfs/interface-go-ipfs-core" options "github.com/ipfs/interface-go-ipfs-core/options" nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys" @@ -506,13 +506,13 @@ func toSubdomainURL(hostname, path string, r *http.Request, ipfs iface.CoreAPI) // Normalizations specific to /ipns/{libp2p-key} if isPeerIDNamespace(ns) { // Using Base36 for /ipns/ for consistency - // Context: https://github.com/ipfs/go-ipfs/pull/7441#discussion_r452372828 + // Context: https://github.com/ipfs/ipfs-banana/pull/7441#discussion_r452372828 base = mbase.Base36 // PeerIDs represented as CIDv1 are expected to have libp2p-key // multicodec (https://github.com/libp2p/specs/pull/209). // We ease the transition by fixing multicodec on the fly: - // https://github.com/ipfs/go-ipfs/issues/5287#issuecomment-492163929 + // https://github.com/ipfs/ipfs-banana/issues/5287#issuecomment-492163929 if multicodec != cid.Libp2pKey { multicodec = cid.Libp2pKey } @@ -531,7 +531,7 @@ func toSubdomainURL(hostname, path string, r *http.Request, ipfs iface.CoreAPI) return "", err } // 2. Make sure CID fits in a DNS label, adjust encoding if needed - // (https://github.com/ipfs/go-ipfs/issues/7318) + // (https://github.com/ipfs/ipfs-banana/issues/7318) rootID, err = toDNSLabel(rootID, rootCID) if err != nil { return "", err diff --git a/core/corehttp/hostname_test.go b/core/corehttp/hostname_test.go index df0f4f22971d..ea01888aeb17 100644 --- a/core/corehttp/hostname_test.go +++ b/core/corehttp/hostname_test.go @@ -8,8 +8,8 @@ import ( cid "github.com/ipfs/go-cid" files "github.com/ipfs/go-ipfs-files" - config "github.com/ipfs/go-ipfs/config" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" + config "github.com/ipfs/ipfs-banana/config" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" path "github.com/ipfs/go-path" ) diff --git a/core/corehttp/logs.go b/core/corehttp/logs.go index 99e8fa8853b5..ed042bff276f 100644 --- a/core/corehttp/logs.go +++ b/core/corehttp/logs.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" lwriter "github.com/ipfs/go-log/writer" ) diff --git a/core/corehttp/metrics.go b/core/corehttp/metrics.go index c3dbde0ac013..fcfb1b8e3c75 100644 --- a/core/corehttp/metrics.go +++ b/core/corehttp/metrics.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" "go.opencensus.io/stats/view" "go.opencensus.io/zpages" diff --git a/core/corehttp/metrics_test.go b/core/corehttp/metrics_test.go index 76f79d2ee2d6..b1fb0a3fa985 100644 --- a/core/corehttp/metrics_test.go +++ b/core/corehttp/metrics_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/ipfs/go-ipfs/core" + "github.com/ipfs/ipfs-banana/core" inet "github.com/libp2p/go-libp2p-core/network" swarmt "github.com/libp2p/go-libp2p-swarm/testing" diff --git a/core/corehttp/mutex_profile.go b/core/corehttp/mutex_profile.go index a8265326c5ec..78fdf6df6e2e 100644 --- a/core/corehttp/mutex_profile.go +++ b/core/corehttp/mutex_profile.go @@ -6,7 +6,7 @@ import ( "runtime" "strconv" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" ) // MutexFractionOption allows to set runtime.SetMutexProfileFraction via HTTP diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go index 57f8d3b16720..b051b89f92a7 100644 --- a/core/corehttp/option_test.go +++ b/core/corehttp/option_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - version "github.com/ipfs/go-ipfs" + version "github.com/ipfs/ipfs-banana" ) type testcasecheckversion struct { diff --git a/core/corehttp/p2p_proxy.go b/core/corehttp/p2p_proxy.go index 1dee5055a507..a79ee5bc5a49 100644 --- a/core/corehttp/p2p_proxy.go +++ b/core/corehttp/p2p_proxy.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" peer "github.com/libp2p/go-libp2p-core/peer" protocol "github.com/libp2p/go-libp2p-core/protocol" diff --git a/core/corehttp/p2p_proxy_test.go b/core/corehttp/p2p_proxy_test.go index 9f99463d9e73..1f7743ecf929 100644 --- a/core/corehttp/p2p_proxy_test.go +++ b/core/corehttp/p2p_proxy_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/ipfs/go-ipfs/thirdparty/assert" + "github.com/ipfs/ipfs-banana/thirdparty/assert" protocol "github.com/libp2p/go-libp2p-core/protocol" ) diff --git a/core/corehttp/redirect.go b/core/corehttp/redirect.go index e7b961e604ef..082d8a78822c 100644 --- a/core/corehttp/redirect.go +++ b/core/corehttp/redirect.go @@ -4,7 +4,7 @@ import ( "net" "net/http" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" ) func RedirectOption(path string, redirect string) ServeOption { diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go index 5db45bf477d8..e5f8949aec51 100644 --- a/core/corerepo/gc.go +++ b/core/corerepo/gc.go @@ -6,9 +6,9 @@ import ( "errors" "time" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/gc" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/gc" + "github.com/ipfs/ipfs-banana/repo" "github.com/dustin/go-humanize" "github.com/ipfs/go-cid" diff --git a/core/corerepo/stat.go b/core/corerepo/stat.go index 52a42ca8c2b4..d84c54143e44 100644 --- a/core/corerepo/stat.go +++ b/core/corerepo/stat.go @@ -6,8 +6,8 @@ import ( context "context" - "github.com/ipfs/go-ipfs/core" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/core" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" humanize "github.com/dustin/go-humanize" ) diff --git a/core/coreunix/add.go b/core/coreunix/add.go index a0079b9eb079..768b92cb2a14 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -14,7 +14,7 @@ import ( files "github.com/ipfs/go-ipfs-files" pin "github.com/ipfs/go-ipfs-pinner" posinfo "github.com/ipfs/go-ipfs-posinfo" - "github.com/ipfs/go-ipfs/tracing" + "github.com/ipfs/ipfs-banana/tracing" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" dag "github.com/ipfs/go-merkledag" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index de326559c3f2..5d26170bd3ac 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/gc" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/gc" + "github.com/ipfs/ipfs-banana/repo" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" @@ -23,7 +23,7 @@ import ( blockstore "github.com/ipfs/go-ipfs-blockstore" files "github.com/ipfs/go-ipfs-files" pi "github.com/ipfs/go-ipfs-posinfo" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" dag "github.com/ipfs/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" ) diff --git a/core/coreunix/metadata.go b/core/coreunix/metadata.go index c9e93ced5df0..49d569465b6b 100644 --- a/core/coreunix/metadata.go +++ b/core/coreunix/metadata.go @@ -2,7 +2,7 @@ package coreunix import ( cid "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" dag "github.com/ipfs/go-merkledag" ft "github.com/ipfs/go-unixfs" ) diff --git a/core/coreunix/metadata_test.go b/core/coreunix/metadata_test.go index 42d7d348c55b..f9785d95de37 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -8,7 +8,7 @@ import ( "testing" bserv "github.com/ipfs/go-blockservice" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" merkledag "github.com/ipfs/go-merkledag" ft "github.com/ipfs/go-unixfs" importer "github.com/ipfs/go-unixfs/importer" diff --git a/core/mock/mock.go b/core/mock/mock.go index 0b34857f2b67..bab5b685b314 100644 --- a/core/mock/mock.go +++ b/core/mock/mock.go @@ -5,15 +5,15 @@ import ( "fmt" "io/ioutil" - libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p" + libp2p2 "github.com/ipfs/ipfs-banana/core/node/libp2p" - "github.com/ipfs/go-ipfs/commands" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/commands" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/repo" "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/host" diff --git a/core/node/bitswap.go b/core/node/bitswap.go index 44698f92123b..3442fe9d7505 100644 --- a/core/node/bitswap.go +++ b/core/node/bitswap.go @@ -7,16 +7,16 @@ import ( "github.com/ipfs/go-bitswap/network" blockstore "github.com/ipfs/go-ipfs-blockstore" exchange "github.com/ipfs/go-ipfs-exchange-interface" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/routing" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" ) const ( - // Docs: https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#internalbitswap + // Docs: https://github.com/ipfs/ipfs-banana/blob/master/docs/config.md#internalbitswap DefaultEngineBlockstoreWorkerCount = 128 DefaultTaskWorkerCount = 8 DefaultEngineTaskWorkerCount = 8 diff --git a/core/node/builder.go b/core/node/builder.go index 689f151b17a8..0c8367872bfe 100644 --- a/core/node/builder.go +++ b/core/node/builder.go @@ -8,13 +8,13 @@ import ( "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/repo" ds "github.com/ipfs/go-datastore" dsync "github.com/ipfs/go-datastore/sync" - cfg "github.com/ipfs/go-ipfs/config" + cfg "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p-core/crypto" peer "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/core/node/core.go b/core/node/core.go index c8305bb610a6..01d3688fb6aa 100644 --- a/core/node/core.go +++ b/core/node/core.go @@ -25,8 +25,8 @@ import ( "github.com/ipld/go-ipld-prime/schema" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core/node/helpers" + "github.com/ipfs/ipfs-banana/repo" ) // BlockService creates new blockservice which provides an interface to fetch content-addressable blocks diff --git a/core/node/dns.go b/core/node/dns.go index 2fc6327635c1..86b3aa40203f 100644 --- a/core/node/dns.go +++ b/core/node/dns.go @@ -6,7 +6,7 @@ import ( "strings" "time" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" doh "github.com/libp2p/go-doh-resolver" madns "github.com/multiformats/go-multiaddr-dns" diff --git a/core/node/graphsync.go b/core/node/graphsync.go index 521a62a6a555..57a9e773715b 100644 --- a/core/node/graphsync.go +++ b/core/node/graphsync.go @@ -9,7 +9,7 @@ import ( libp2p "github.com/libp2p/go-libp2p-core" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" ) // Graphsync constructs a graphsync diff --git a/core/node/groups.go b/core/node/groups.go index 007d2a76eb2a..d65ddcc7ef76 100644 --- a/core/node/groups.go +++ b/core/node/groups.go @@ -8,13 +8,13 @@ import ( blockstore "github.com/ipfs/go-ipfs-blockstore" util "github.com/ipfs/go-ipfs-util" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/ipfs-banana/config" "github.com/ipfs/go-log" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/p2p" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/p2p" offline "github.com/ipfs/go-ipfs-exchange-offline" offroute "github.com/ipfs/go-ipfs-routing/offline" diff --git a/core/node/ipns.go b/core/node/ipns.go index a178ee3321e4..a86f9dfd517c 100644 --- a/core/node/ipns.go +++ b/core/node/ipns.go @@ -12,7 +12,7 @@ import ( "github.com/libp2p/go-libp2p-record" madns "github.com/multiformats/go-multiaddr-dns" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/repo" "github.com/ipfs/go-namesys" "github.com/ipfs/go-namesys/republisher" ) diff --git a/core/node/libp2p/discovery.go b/core/node/libp2p/discovery.go index dbc2b0beaada..58d9791f8fa3 100644 --- a/core/node/libp2p/discovery.go +++ b/core/node/libp2p/discovery.go @@ -11,7 +11,7 @@ import ( "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" ) const discoveryConnTimeout = time.Second * 30 diff --git a/core/node/libp2p/host.go b/core/node/libp2p/host.go index 9298f7ffbf9d..d62b1f29574a 100644 --- a/core/node/libp2p/host.go +++ b/core/node/libp2p/host.go @@ -11,8 +11,8 @@ import ( record "github.com/libp2p/go-libp2p-record" routedhost "github.com/libp2p/go-libp2p/p2p/host/routed" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core/node/helpers" + "github.com/ipfs/ipfs-banana/repo" "go.uber.org/fx" ) diff --git a/core/node/libp2p/libp2p.go b/core/node/libp2p/libp2p.go index 59e9a37d4dff..7ceee77bc5b9 100644 --- a/core/node/libp2p/libp2p.go +++ b/core/node/libp2p/libp2p.go @@ -5,8 +5,8 @@ import ( "sort" "time" - version "github.com/ipfs/go-ipfs" - config "github.com/ipfs/go-ipfs/config" + version "github.com/ipfs/ipfs-banana" + config "github.com/ipfs/ipfs-banana/config" logging "github.com/ipfs/go-log" "github.com/libp2p/go-libp2p" diff --git a/core/node/libp2p/nat.go b/core/node/libp2p/nat.go index 28560662d2c2..fda5a9883154 100644 --- a/core/node/libp2p/nat.go +++ b/core/node/libp2p/nat.go @@ -3,7 +3,7 @@ package libp2p import ( "time" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" ) diff --git a/core/node/libp2p/pnet.go b/core/node/libp2p/pnet.go index 4261e5e5ed5a..423f2216f8c4 100644 --- a/core/node/libp2p/pnet.go +++ b/core/node/libp2p/pnet.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/repo" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/host" diff --git a/core/node/libp2p/pubsub.go b/core/node/libp2p/pubsub.go index e8b3e57fbdaf..7f102892d671 100644 --- a/core/node/libp2p/pubsub.go +++ b/core/node/libp2p/pubsub.go @@ -6,7 +6,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" ) func FloodSub(pubsubOptions ...pubsub.Option) interface{} { diff --git a/core/node/libp2p/rcmgr.go b/core/node/libp2p/rcmgr.go index 28d05a131b43..a8f400447f71 100644 --- a/core/node/libp2p/rcmgr.go +++ b/core/node/libp2p/rcmgr.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/repo" + config "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/repo" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/network" diff --git a/core/node/libp2p/rcmgr_defaults.go b/core/node/libp2p/rcmgr_defaults.go index e5e0cbb346f9..c9bdfa2dedf8 100644 --- a/core/node/libp2p/rcmgr_defaults.go +++ b/core/node/libp2p/rcmgr_defaults.go @@ -6,7 +6,7 @@ import ( "math/bits" "strings" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" rcmgr "github.com/libp2p/go-libp2p-resource-manager" diff --git a/core/node/libp2p/relay.go b/core/node/libp2p/relay.go index 5bb8b946e510..6acfd6171aac 100644 --- a/core/node/libp2p/relay.go +++ b/core/node/libp2p/relay.go @@ -1,7 +1,7 @@ package libp2p import ( - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p/p2p/host/autorelay" diff --git a/core/node/libp2p/routing.go b/core/node/libp2p/routing.go index 9c7351318d16..caa6a9eca533 100644 --- a/core/node/libp2p/routing.go +++ b/core/node/libp2p/routing.go @@ -7,10 +7,10 @@ import ( "sort" "time" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/repo" + config "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/repo" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/routing" diff --git a/core/node/libp2p/sec.go b/core/node/libp2p/sec.go index 6246d2fe30d4..b0726798af60 100644 --- a/core/node/libp2p/sec.go +++ b/core/node/libp2p/sec.go @@ -1,7 +1,7 @@ package libp2p import ( - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" noise "github.com/libp2p/go-libp2p-noise" tls "github.com/libp2p/go-libp2p-tls" diff --git a/core/node/libp2p/smux.go b/core/node/libp2p/smux.go index 539cad307884..4154f627ee80 100644 --- a/core/node/libp2p/smux.go +++ b/core/node/libp2p/smux.go @@ -5,7 +5,7 @@ import ( "os" "strings" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/network" mplex "github.com/libp2p/go-libp2p-mplex" diff --git a/core/node/libp2p/topicdiscovery.go b/core/node/libp2p/topicdiscovery.go index fd2cbe006371..7a6e8f3491ad 100644 --- a/core/node/libp2p/topicdiscovery.go +++ b/core/node/libp2p/topicdiscovery.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p-core/host" disc "github.com/libp2p/go-libp2p-discovery" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/helpers" "go.uber.org/fx" ) diff --git a/core/node/libp2p/transport.go b/core/node/libp2p/transport.go index 303a70d80611..2822d9f3c305 100644 --- a/core/node/libp2p/transport.go +++ b/core/node/libp2p/transport.go @@ -3,7 +3,7 @@ package libp2p import ( "fmt" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" libp2p "github.com/libp2p/go-libp2p" metrics "github.com/libp2p/go-libp2p-core/metrics" libp2pquic "github.com/libp2p/go-libp2p-quic-transport" diff --git a/core/node/peering.go b/core/node/peering.go index b5e7caadc335..20742c35bff0 100644 --- a/core/node/peering.go +++ b/core/node/peering.go @@ -3,7 +3,7 @@ package node import ( "context" - "github.com/ipfs/go-ipfs/peering" + "github.com/ipfs/ipfs-banana/peering" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" "go.uber.org/fx" diff --git a/core/node/provider.go b/core/node/provider.go index 3dd7f9b728ab..ce8d4e9d558f 100644 --- a/core/node/provider.go +++ b/core/node/provider.go @@ -15,9 +15,9 @@ import ( "github.com/multiformats/go-multihash" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/core/node/helpers" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/repo" ) const kReprovideFrequency = time.Hour * 12 diff --git a/core/node/storage.go b/core/node/storage.go index 6a647ffd7bc9..6d9cd0655ca1 100644 --- a/core/node/storage.go +++ b/core/node/storage.go @@ -3,13 +3,13 @@ package node import ( "github.com/ipfs/go-datastore" blockstore "github.com/ipfs/go-ipfs-blockstore" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" "go.uber.org/fx" "github.com/ipfs/go-filestore" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/thirdparty/verifbs" + "github.com/ipfs/ipfs-banana/core/node/helpers" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/thirdparty/verifbs" ) // RepoConfig loads configuration from the repo diff --git a/fuse/ipns/common.go b/fuse/ipns/common.go index 1b810eaa990a..f6ed02e5046d 100644 --- a/fuse/ipns/common.go +++ b/fuse/ipns/common.go @@ -3,7 +3,7 @@ package ipns import ( "context" - "github.com/ipfs/go-ipfs/core" + "github.com/ipfs/ipfs-banana/core" nsys "github.com/ipfs/go-namesys" path "github.com/ipfs/go-path" ft "github.com/ipfs/go-unixfs" diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index cc725d8cb12a..a1b9d52eea90 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -16,8 +16,8 @@ import ( "bazil.org/fuse" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" fstest "bazil.org/fuse/fs/fstestutil" racedet "github.com/ipfs/go-detect-race" diff --git a/fuse/ipns/mount_unix.go b/fuse/ipns/mount_unix.go index c59701146fb7..d117b7a576f7 100644 --- a/fuse/ipns/mount_unix.go +++ b/fuse/ipns/mount_unix.go @@ -5,9 +5,9 @@ package ipns import ( - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" - mount "github.com/ipfs/go-ipfs/fuse/mount" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" + mount "github.com/ipfs/ipfs-banana/fuse/mount" ) // Mount mounts ipns at a given location, and returns a mount.Mount instance. diff --git a/fuse/node/mount_darwin.go b/fuse/node/mount_darwin.go index 382f575e2cfb..aea506c02ec3 100644 --- a/fuse/node/mount_darwin.go +++ b/fuse/node/mount_darwin.go @@ -10,7 +10,7 @@ import ( "runtime" "strings" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" "github.com/blang/semver/v4" unix "golang.org/x/sys/unix" @@ -39,7 +39,7 @@ It is recommended you install it from the OSXFUSE website: For more help, see: - https://github.com/ipfs/go-ipfs/issues/177 + https://github.com/ipfs/ipfs-banana/issues/177 ` // errStrNoFuseHeaders is included in the output of `go get ` if there @@ -56,7 +56,7 @@ It is recommended you install it from the OSXFUSE website: For more help, see: - https://github.com/ipfs/go-ipfs/issues/177 + https://github.com/ipfs/ipfs-banana/issues/177 ` type errNeedFuseVersion struct { @@ -82,8 +82,8 @@ version you have by running: ipfs config --bool %s true -[1]: https://github.com/ipfs/go-ipfs/issues/177 -[2]: https://github.com/ipfs/go-ipfs/pull/533 +[1]: https://github.com/ipfs/ipfs-banana/issues/177 +[2]: https://github.com/ipfs/ipfs-banana/pull/533 [3]: %s `, fuseVersionPkg, dontCheckOSXFUSEConfigKey, me.cause) } @@ -113,8 +113,8 @@ trying to run these checks with: ipfs config --bool %s true -[1]: https://github.com/ipfs/go-ipfs/issues/177 -[2]: https://github.com/ipfs/go-ipfs/pull/533 +[1]: https://github.com/ipfs/ipfs-banana/issues/177 +[2]: https://github.com/ipfs/ipfs-banana/pull/533 [3]: %s ` @@ -123,7 +123,7 @@ You may be able to get this error to go away by setting it again: ipfs config --bool %s true -Either way, please tell us at: http://github.com/ipfs/go-ipfs/issues +Either way, please tell us at: http://github.com/ipfs/ipfs-banana/issues ` func darwinFuseCheckVersion(node *core.IpfsNode) error { diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go index a5433c8c39ed..7f14e58d847e 100644 --- a/fuse/node/mount_nofuse.go +++ b/fuse/node/mount_nofuse.go @@ -6,7 +6,7 @@ package node import ( "errors" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" ) func Mount(node *core.IpfsNode, fsdir, nsdir string) error { diff --git a/fuse/node/mount_notsupp.go b/fuse/node/mount_notsupp.go index d0db6f6b4834..108d6483ae6a 100644 --- a/fuse/node/mount_notsupp.go +++ b/fuse/node/mount_notsupp.go @@ -6,9 +6,9 @@ package node import ( "errors" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" ) func Mount(node *core.IpfsNode, fsdir, nsdir string) error { - return errors.New("FUSE not supported on OpenBSD or NetBSD. See #5334 (https://github.com/ipfs/go-ipfs/issues/5334).") + return errors.New("FUSE not supported on OpenBSD or NetBSD. See #5334 (https://github.com/ipfs/ipfs-banana/issues/5334).") } diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index 23eba3bc3f58..b784ea07925a 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -14,9 +14,9 @@ import ( "context" - core "github.com/ipfs/go-ipfs/core" - ipns "github.com/ipfs/go-ipfs/fuse/ipns" - mount "github.com/ipfs/go-ipfs/fuse/mount" + core "github.com/ipfs/ipfs-banana/core" + ipns "github.com/ipfs/ipfs-banana/fuse/ipns" + mount "github.com/ipfs/ipfs-banana/fuse/mount" ci "github.com/libp2p/go-libp2p-testing/ci" ) diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go index 852284357966..dc0ee3a85b4d 100644 --- a/fuse/node/mount_unix.go +++ b/fuse/node/mount_unix.go @@ -9,10 +9,10 @@ import ( "strings" "sync" - core "github.com/ipfs/go-ipfs/core" - ipns "github.com/ipfs/go-ipfs/fuse/ipns" - mount "github.com/ipfs/go-ipfs/fuse/mount" - rofs "github.com/ipfs/go-ipfs/fuse/readonly" + core "github.com/ipfs/ipfs-banana/core" + ipns "github.com/ipfs/ipfs-banana/fuse/ipns" + mount "github.com/ipfs/ipfs-banana/fuse/mount" + rofs "github.com/ipfs/ipfs-banana/fuse/readonly" logging "github.com/ipfs/go-log" ) diff --git a/fuse/node/mount_windows.go b/fuse/node/mount_windows.go index ce89deddb238..d1ab70d9857a 100644 --- a/fuse/node/mount_windows.go +++ b/fuse/node/mount_windows.go @@ -1,7 +1,7 @@ package node import ( - "github.com/ipfs/go-ipfs/core" + "github.com/ipfs/ipfs-banana/core" ) func Mount(node *core.IpfsNode, fsdir, nsdir string) error { diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index d869e3d5da43..7f7d17f1656e 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -19,9 +19,9 @@ import ( "bazil.org/fuse" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" - coremock "github.com/ipfs/go-ipfs/core/mock" + core "github.com/ipfs/ipfs-banana/core" + coreapi "github.com/ipfs/ipfs-banana/core/coreapi" + coremock "github.com/ipfs/ipfs-banana/core/mock" fstest "bazil.org/fuse/fs/fstestutil" chunker "github.com/ipfs/go-ipfs-chunker" diff --git a/fuse/readonly/mount_unix.go b/fuse/readonly/mount_unix.go index 719cb5ef2952..78577f48be56 100644 --- a/fuse/readonly/mount_unix.go +++ b/fuse/readonly/mount_unix.go @@ -5,8 +5,8 @@ package readonly import ( - core "github.com/ipfs/go-ipfs/core" - mount "github.com/ipfs/go-ipfs/fuse/mount" + core "github.com/ipfs/ipfs-banana/core" + mount "github.com/ipfs/ipfs-banana/fuse/mount" ) // Mount mounts IPFS at a given location, and returns a mount.Mount instance. diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index af961221ca70..971f00779ea6 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -14,7 +14,7 @@ import ( fuse "bazil.org/fuse" fs "bazil.org/fuse/fs" "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" + core "github.com/ipfs/ipfs-banana/core" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" mdag "github.com/ipfs/go-merkledag" diff --git a/go.mod b/go.mod index 02da160329f2..c9b90845b002 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ipfs/go-ipfs +module github.com/ipfs/ipfs-banana require ( bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc diff --git a/mk/golang.mk b/mk/golang.mk index 93753e5c1b36..1a061e8607f5 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -26,10 +26,10 @@ TEST_GO := TEST_GO_BUILD := CHECK_GO := -go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/go-ipfs/$(1)) +go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/ipfs-banana/$(1)) go-main-name=$(notdir $(call go-pkg-name,$(1)))$(?exe) go-curr-pkg-tgt=$(d)/$(call go-main-name,$(d)) -go-pkgs=$(shell $(GOCC) list github.com/ipfs/go-ipfs/...) +go-pkgs=$(shell $(GOCC) list github.com/ipfs/ipfs-banana/...) go-tags=$(if $(GOTAGS), -tags="$(call join-with,$(space),$(GOTAGS))") go-flags-with-tags=$(GOFLAGS)$(go-tags) diff --git a/plugin/daemoninternal.go b/plugin/daemoninternal.go index cb4c2448d038..ef32306bbfa2 100644 --- a/plugin/daemoninternal.go +++ b/plugin/daemoninternal.go @@ -1,6 +1,6 @@ package plugin -import "github.com/ipfs/go-ipfs/core" +import "github.com/ipfs/ipfs-banana/core" // PluginDaemonInternal is an interface for daemon plugins. These plugins will be run on // the daemon and will be given a direct access to the IpfsNode. diff --git a/plugin/datastore.go b/plugin/datastore.go index 735eedc9d764..7def4be3237a 100644 --- a/plugin/datastore.go +++ b/plugin/datastore.go @@ -1,7 +1,7 @@ package plugin import ( - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" ) // PluginDatastore is an interface that can be implemented to add handlers for diff --git a/plugin/loader/load_nocgo.go b/plugin/loader/load_nocgo.go index 26bb215f29cc..cdcbc50c331a 100644 --- a/plugin/loader/load_nocgo.go +++ b/plugin/loader/load_nocgo.go @@ -8,7 +8,7 @@ package loader import ( "errors" - iplugin "github.com/ipfs/go-ipfs/plugin" + iplugin "github.com/ipfs/ipfs-banana/plugin" ) func init() { diff --git a/plugin/loader/load_noplugin.go b/plugin/loader/load_noplugin.go index 25b1c0c38798..87f79e339014 100644 --- a/plugin/loader/load_noplugin.go +++ b/plugin/loader/load_noplugin.go @@ -6,7 +6,7 @@ package loader import ( "errors" - iplugin "github.com/ipfs/go-ipfs/plugin" + iplugin "github.com/ipfs/ipfs-banana/plugin" ) func init() { diff --git a/plugin/loader/load_unix.go b/plugin/loader/load_unix.go index 19ca49889745..51a951f57d64 100644 --- a/plugin/loader/load_unix.go +++ b/plugin/loader/load_unix.go @@ -9,7 +9,7 @@ import ( "errors" "plugin" - iplugin "github.com/ipfs/go-ipfs/plugin" + iplugin "github.com/ipfs/ipfs-banana/plugin" ) func init() { diff --git a/plugin/loader/loader.go b/plugin/loader/loader.go index 3c52a4105ad8..1ef5df23e4df 100644 --- a/plugin/loader/loader.go +++ b/plugin/loader/loader.go @@ -8,14 +8,14 @@ import ( "runtime" "strings" - config "github.com/ipfs/go-ipfs/config" - cserialize "github.com/ipfs/go-ipfs/config/serialize" + config "github.com/ipfs/ipfs-banana/config" + cserialize "github.com/ipfs/ipfs-banana/config/serialize" "github.com/ipld/go-ipld-prime/multicodec" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/coreapi" - plugin "github.com/ipfs/go-ipfs/plugin" - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/coreapi" + plugin "github.com/ipfs/ipfs-banana/plugin" + fsrepo "github.com/ipfs/ipfs-banana/repo/fsrepo" logging "github.com/ipfs/go-log" opentracing "github.com/opentracing/opentracing-go" diff --git a/plugin/loader/preload.go b/plugin/loader/preload.go index 17da3c2f7ad3..e80761f8c8dd 100644 --- a/plugin/loader/preload.go +++ b/plugin/loader/preload.go @@ -1,12 +1,12 @@ package loader import ( - pluginbadgerds "github.com/ipfs/go-ipfs/plugin/plugins/badgerds" - pluginiplddagjose "github.com/ipfs/go-ipfs/plugin/plugins/dagjose" - pluginflatfs "github.com/ipfs/go-ipfs/plugin/plugins/flatfs" - pluginipldgit "github.com/ipfs/go-ipfs/plugin/plugins/git" - pluginlevelds "github.com/ipfs/go-ipfs/plugin/plugins/levelds" - pluginpeerlog "github.com/ipfs/go-ipfs/plugin/plugins/peerlog" + pluginbadgerds "github.com/ipfs/ipfs-banana/plugin/plugins/badgerds" + pluginiplddagjose "github.com/ipfs/ipfs-banana/plugin/plugins/dagjose" + pluginflatfs "github.com/ipfs/ipfs-banana/plugin/plugins/flatfs" + pluginipldgit "github.com/ipfs/ipfs-banana/plugin/plugins/git" + pluginlevelds "github.com/ipfs/ipfs-banana/plugin/plugins/levelds" + pluginpeerlog "github.com/ipfs/ipfs-banana/plugin/plugins/peerlog" ) // DO NOT EDIT THIS FILE diff --git a/plugin/loader/preload.sh b/plugin/loader/preload.sh index 256a23bc9f20..cb266eaea31e 100755 --- a/plugin/loader/preload.sh +++ b/plugin/loader/preload.sh @@ -8,7 +8,7 @@ to_preload() { awk 'NF' $LIST | sed '/^#/d' if [[ -n "$IPFS_PLUGINS" ]]; then for plugin in $IPFS_PLUGINS; do - echo "$plugin github.com/ipfs/go-ipfs/plugin/plugins/$plugin *" + echo "$plugin github.com/ipfs/ipfs-banana/plugin/plugins/$plugin *" done fi } diff --git a/plugin/loader/preload_list b/plugin/loader/preload_list index 54b8dee6fc9f..442aef6d31e8 100644 --- a/plugin/loader/preload_list +++ b/plugin/loader/preload_list @@ -3,10 +3,10 @@ # # name go-path number of the sub-plugin or * -ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git * -iplddagjose github.com/ipfs/go-ipfs/plugin/plugins/dagjose * +ipldgit github.com/ipfs/ipfs-banana/plugin/plugins/git * +iplddagjose github.com/ipfs/ipfs-banana/plugin/plugins/dagjose * -badgerds github.com/ipfs/go-ipfs/plugin/plugins/badgerds * -flatfs github.com/ipfs/go-ipfs/plugin/plugins/flatfs * -levelds github.com/ipfs/go-ipfs/plugin/plugins/levelds * -peerlog github.com/ipfs/go-ipfs/plugin/plugins/peerlog * \ No newline at end of file +badgerds github.com/ipfs/ipfs-banana/plugin/plugins/badgerds * +flatfs github.com/ipfs/ipfs-banana/plugin/plugins/flatfs * +levelds github.com/ipfs/ipfs-banana/plugin/plugins/levelds * +peerlog github.com/ipfs/ipfs-banana/plugin/plugins/peerlog * diff --git a/plugin/plugins/badgerds/badgerds.go b/plugin/plugins/badgerds/badgerds.go index b998e787766a..c9752fd92d2c 100644 --- a/plugin/plugins/badgerds/badgerds.go +++ b/plugin/plugins/badgerds/badgerds.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/ipfs/go-ipfs/plugin" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/plugin" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" humanize "github.com/dustin/go-humanize" badgerds "github.com/ipfs/go-ds-badger" diff --git a/plugin/plugins/dagjose/dagjose.go b/plugin/plugins/dagjose/dagjose.go index 6d3e35b3d519..9db933c51fc8 100644 --- a/plugin/plugins/dagjose/dagjose.go +++ b/plugin/plugins/dagjose/dagjose.go @@ -1,7 +1,7 @@ package dagjose import ( - "github.com/ipfs/go-ipfs/plugin" + "github.com/ipfs/ipfs-banana/plugin" "github.com/ceramicnetwork/go-dag-jose/dagjose" "github.com/ipld/go-ipld-prime/multicodec" diff --git a/plugin/plugins/flatfs/flatfs.go b/plugin/plugins/flatfs/flatfs.go index 074cc590df08..2c12fab87144 100644 --- a/plugin/plugins/flatfs/flatfs.go +++ b/plugin/plugins/flatfs/flatfs.go @@ -4,9 +4,9 @@ import ( "fmt" "path/filepath" - "github.com/ipfs/go-ipfs/plugin" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/plugin" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" flatfs "github.com/ipfs/go-ds-flatfs" ) diff --git a/plugin/plugins/git/git.go b/plugin/plugins/git/git.go index bc28084ffe52..9968599a358a 100644 --- a/plugin/plugins/git/git.go +++ b/plugin/plugins/git/git.go @@ -4,7 +4,7 @@ import ( "compress/zlib" "io" - "github.com/ipfs/go-ipfs/plugin" + "github.com/ipfs/ipfs-banana/plugin" // Note that depending on this package registers it's multicodec encoder and decoder. git "github.com/ipfs/go-ipld-git" diff --git a/plugin/plugins/levelds/levelds.go b/plugin/plugins/levelds/levelds.go index 8e37bc3a54c7..785d8bdf24ec 100644 --- a/plugin/plugins/levelds/levelds.go +++ b/plugin/plugins/levelds/levelds.go @@ -4,9 +4,9 @@ import ( "fmt" "path/filepath" - "github.com/ipfs/go-ipfs/plugin" - "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/plugin" + "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" levelds "github.com/ipfs/go-ds-leveldb" ldbopts "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/plugin/plugins/peerlog/peerlog.go b/plugin/plugins/peerlog/peerlog.go index b73722c2c1ba..bae4ab21e61a 100644 --- a/plugin/plugins/peerlog/peerlog.go +++ b/plugin/plugins/peerlog/peerlog.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - core "github.com/ipfs/go-ipfs/core" - plugin "github.com/ipfs/go-ipfs/plugin" + core "github.com/ipfs/ipfs-banana/core" + plugin "github.com/ipfs/ipfs-banana/plugin" logging "github.com/ipfs/go-log" event "github.com/libp2p/go-libp2p-core/event" network "github.com/libp2p/go-libp2p-core/network" diff --git a/profile/profile.go b/profile/profile.go index 06cd4a7ba33a..9e7e36c4e8d4 100644 --- a/profile/profile.go +++ b/profile/profile.go @@ -13,7 +13,7 @@ import ( "sync" "time" - version "github.com/ipfs/go-ipfs" + version "github.com/ipfs/ipfs-banana" "github.com/ipfs/go-log" ) diff --git a/repo/common/common_test.go b/repo/common/common_test.go index 5f62b688c8f6..d849dbaa67dc 100644 --- a/repo/common/common_test.go +++ b/repo/common/common_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/ipfs/go-ipfs/thirdparty/assert" + "github.com/ipfs/ipfs-banana/thirdparty/assert" ) func TestMapMergeDeepReturnsNew(t *testing.T) { diff --git a/repo/fsrepo/config_test.go b/repo/fsrepo/config_test.go index 0ffdababe27d..ab6550af3627 100644 --- a/repo/fsrepo/config_test.go +++ b/repo/fsrepo/config_test.go @@ -7,10 +7,10 @@ import ( "reflect" "testing" - "github.com/ipfs/go-ipfs/plugin/loader" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/plugin/loader" + "github.com/ipfs/ipfs-banana/repo/fsrepo" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/ipfs-banana/config" ) // note: to test sorting of the mountpoints in the disk spec they are diff --git a/repo/fsrepo/datastores.go b/repo/fsrepo/datastores.go index 8cdf25fc29f7..1979732bd2ad 100644 --- a/repo/fsrepo/datastores.go +++ b/repo/fsrepo/datastores.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/ipfs-banana/repo" ds "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/mount" diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go index c35d5458dc71..3e1254bef129 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -13,17 +13,17 @@ import ( filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs-keystore" - repo "github.com/ipfs/go-ipfs/repo" - "github.com/ipfs/go-ipfs/repo/common" - dir "github.com/ipfs/go-ipfs/thirdparty/dir" + repo "github.com/ipfs/ipfs-banana/repo" + "github.com/ipfs/ipfs-banana/repo/common" + dir "github.com/ipfs/ipfs-banana/thirdparty/dir" ds "github.com/ipfs/go-datastore" measure "github.com/ipfs/go-ds-measure" lockfile "github.com/ipfs/go-fs-lock" util "github.com/ipfs/go-ipfs-util" - config "github.com/ipfs/go-ipfs/config" - serialize "github.com/ipfs/go-ipfs/config/serialize" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" + config "github.com/ipfs/ipfs-banana/config" + serialize "github.com/ipfs/ipfs-banana/config/serialize" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" logging "github.com/ipfs/go-log" homedir "github.com/mitchellh/go-homedir" ma "github.com/multiformats/go-multiaddr" @@ -418,7 +418,7 @@ func (r *FSRepo) openDatastore() error { return fmt.Errorf("required Datastore.Spec entry missing from config file") } if r.config.Datastore.NoSync { - log.Warn("NoSync is now deprecated in favor of datastore specific settings. If you want to disable fsync on flatfs set 'sync' to false. See https://github.com/ipfs/go-ipfs/blob/master/docs/datastores.md#flatfs.") + log.Warn("NoSync is now deprecated in favor of datastore specific settings. If you want to disable fsync on flatfs set 'sync' to false. See https://github.com/ipfs/ipfs-banana/blob/master/docs/datastores.md#flatfs.") } dsc, err := AnyDatastoreConfig(r.config.Datastore.Spec) @@ -542,7 +542,7 @@ func (r *FSRepo) BackupConfig(prefix string) (string, error) { // evidenced by the issue of `omitempty` property of fields that aren't defined // by the user and Go still needs to initialize them to its default (which // is not reflected in the repo's config file, see -// https://github.com/ipfs/go-ipfs/issues/8088 for more details). +// https://github.com/ipfs/ipfs-banana/issues/8088 for more details). // In general we should call this API with a JSON nested maps as argument // (`map[string]interface{}`). Many calls to this function are forced to // synthesize the config.Config struct from their available JSON map just to diff --git a/repo/fsrepo/fsrepo_test.go b/repo/fsrepo/fsrepo_test.go index cf9aeabec0ef..d146600d9118 100644 --- a/repo/fsrepo/fsrepo_test.go +++ b/repo/fsrepo/fsrepo_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/ipfs/go-ipfs/thirdparty/assert" + "github.com/ipfs/ipfs-banana/thirdparty/assert" datastore "github.com/ipfs/go-datastore" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) // swap arg order diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go index 4a723293e6b5..9204f497a40b 100644 --- a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go +++ b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go @@ -13,12 +13,12 @@ import ( "sync" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/coreapi" - "github.com/ipfs/go-ipfs/core/node/libp2p" - "github.com/ipfs/go-ipfs/repo/fsrepo" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" + "github.com/ipfs/ipfs-banana/config" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/coreapi" + "github.com/ipfs/ipfs-banana/core/node/libp2p" + "github.com/ipfs/ipfs-banana/repo/fsrepo" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" iface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/options" ipath "github.com/ipfs/interface-go-ipfs-core/path" diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go index 4e882b7ad834..ad71a5927cb1 100644 --- a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go +++ b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/ipfs/go-ipfs/plugin/loader" - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" + "github.com/ipfs/ipfs-banana/plugin/loader" + "github.com/ipfs/ipfs-banana/repo/fsrepo/migrations" ) func init() { diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go index 02738483e29d..58a9ef6031be 100644 --- a/repo/fsrepo/migrations/migrations.go +++ b/repo/fsrepo/migrations/migrations.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) const ( diff --git a/repo/fsrepo/migrations/migrations_test.go b/repo/fsrepo/migrations/migrations_test.go index 4fb75774793f..ca1b7fbe535a 100644 --- a/repo/fsrepo/migrations/migrations_test.go +++ b/repo/fsrepo/migrations/migrations_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ) func TestFindMigrations(t *testing.T) { diff --git a/repo/fsrepo/misc.go b/repo/fsrepo/misc.go index 71b640331d40..9c202425b400 100644 --- a/repo/fsrepo/misc.go +++ b/repo/fsrepo/misc.go @@ -3,7 +3,7 @@ package fsrepo import ( "os" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" homedir "github.com/mitchellh/go-homedir" ) diff --git a/repo/mock.go b/repo/mock.go index 15313ab373c2..aeb5d7563f61 100644 --- a/repo/mock.go +++ b/repo/mock.go @@ -7,7 +7,7 @@ import ( filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs-keystore" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ma "github.com/multiformats/go-multiaddr" ) diff --git a/repo/repo.go b/repo/repo.go index 00735eb94eeb..43af5e053845 100644 --- a/repo/repo.go +++ b/repo/repo.go @@ -9,7 +9,7 @@ import ( keystore "github.com/ipfs/go-ipfs-keystore" ds "github.com/ipfs/go-datastore" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" ma "github.com/multiformats/go-multiaddr" ) diff --git a/test/bench/bench_cli_ipfs_add/main.go b/test/bench/bench_cli_ipfs_add/main.go index b11b5f83c7d9..3b3e4bd0a6cd 100644 --- a/test/bench/bench_cli_ipfs_add/main.go +++ b/test/bench/bench_cli_ipfs_add/main.go @@ -10,9 +10,9 @@ import ( "path" "testing" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/ipfs-banana/thirdparty/unit" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" random "github.com/jbenet/go-random" ) diff --git a/test/bench/offline_add/main.go b/test/bench/offline_add/main.go index 5d3f27fed1a2..f03afd3a458e 100644 --- a/test/bench/offline_add/main.go +++ b/test/bench/offline_add/main.go @@ -9,9 +9,9 @@ import ( "path" "testing" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/ipfs-banana/thirdparty/unit" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/ipfs-banana/config" random "github.com/jbenet/go-random" ) diff --git a/test/bin/Rules.mk b/test/bin/Rules.mk index b01ec7dd042c..655e4f0661be 100644 --- a/test/bin/Rules.mk +++ b/test/bin/Rules.mk @@ -8,38 +8,38 @@ define go-build-testdep $(GOCC) build $(go-flags-with-tags) -o "$${OUT}" "$<" endef -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/pollEndpoint -$(d)/pollEndpoint: github.com/ipfs/go-ipfs/test/dependencies/pollEndpoint +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/pollEndpoint +$(d)/pollEndpoint: github.com/ipfs/ipfs-banana/test/dependencies/pollEndpoint $(go-build-testdep) TGTS_$(d) += $(d)/pollEndpoint -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/go-sleep -$(d)/go-sleep: github.com/ipfs/go-ipfs/test/dependencies/go-sleep +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/go-sleep +$(d)/go-sleep: github.com/ipfs/ipfs-banana/test/dependencies/go-sleep $(go-build-testdep) TGTS_$(d) += $(d)/go-sleep -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/graphsync-get -$(d)/graphsync-get: github.com/ipfs/go-ipfs/test/dependencies/graphsync-get +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/graphsync-get +$(d)/graphsync-get: github.com/ipfs/ipfs-banana/test/dependencies/graphsync-get $(go-build-testdep) TGTS_$(d) += $(d)/graphsync-get -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/go-timeout -$(d)/go-timeout: github.com/ipfs/go-ipfs/test/dependencies/go-timeout +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/go-timeout +$(d)/go-timeout: github.com/ipfs/ipfs-banana/test/dependencies/go-timeout $(go-build-testdep) TGTS_$(d) += $(d)/go-timeout -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/iptb -$(d)/iptb: github.com/ipfs/go-ipfs/test/dependencies/iptb +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/iptb +$(d)/iptb: github.com/ipfs/ipfs-banana/test/dependencies/iptb $(go-build-testdep) TGTS_$(d) += $(d)/iptb -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/ma-pipe-unidir -$(d)/ma-pipe-unidir: github.com/ipfs/go-ipfs/test/dependencies/ma-pipe-unidir +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/ma-pipe-unidir +$(d)/ma-pipe-unidir: github.com/ipfs/ipfs-banana/test/dependencies/ma-pipe-unidir $(go-build-testdep) TGTS_$(d) += $(d)/ma-pipe-unidir -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/json-to-junit -$(d)/json-to-junit: github.com/ipfs/go-ipfs/test/dependencies/json-to-junit +.PHONY: github.com/ipfs/ipfs-banana/test/dependencies/json-to-junit +$(d)/json-to-junit: github.com/ipfs/ipfs-banana/test/dependencies/json-to-junit $(go-build-testdep) TGTS_$(d) += $(d)/json-to-junit diff --git a/test/dependencies/go.mod b/test/dependencies/go.mod index b81021b3056e..afc42610e9f3 100644 --- a/test/dependencies/go.mod +++ b/test/dependencies/go.mod @@ -1,4 +1,4 @@ -module github.com/ipfs/go-ipfs/test/dependencies +module github.com/ipfs/ipfs-banana/test/dependencies go 1.17 diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go index f564ee5ee3e9..4b43f693f8b0 100644 --- a/test/integration/addcat_test.go +++ b/test/integration/addcat_test.go @@ -12,11 +12,11 @@ import ( "time" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/coreapi" - mock "github.com/ipfs/go-ipfs/core/mock" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/coreapi" + mock "github.com/ipfs/ipfs-banana/core/mock" + "github.com/ipfs/ipfs-banana/thirdparty/unit" logging "github.com/ipfs/go-log" "github.com/jbenet/go-random" "github.com/libp2p/go-libp2p-core/peer" diff --git a/test/integration/bench_cat_test.go b/test/integration/bench_cat_test.go index 45b3b9f3e283..c08166e04561 100644 --- a/test/integration/bench_cat_test.go +++ b/test/integration/bench_cat_test.go @@ -9,11 +9,11 @@ import ( "testing" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/coreapi" - mock "github.com/ipfs/go-ipfs/core/mock" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/ipfs-banana/core" + "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/coreapi" + mock "github.com/ipfs/ipfs-banana/core/mock" + "github.com/ipfs/ipfs-banana/thirdparty/unit" "github.com/libp2p/go-libp2p-core/peer" testutil "github.com/libp2p/go-libp2p-testing/net" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" diff --git a/test/integration/bench_test.go b/test/integration/bench_test.go index bc5a22ea91dc..d14e9cb8f3ea 100644 --- a/test/integration/bench_test.go +++ b/test/integration/bench_test.go @@ -3,7 +3,7 @@ package integrationtest import ( "testing" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/ipfs-banana/thirdparty/unit" testutil "github.com/libp2p/go-libp2p-testing/net" ) diff --git a/test/integration/bitswap_wo_routing_test.go b/test/integration/bitswap_wo_routing_test.go index 9caa78c38c52..8c68fa5943b3 100644 --- a/test/integration/bitswap_wo_routing_test.go +++ b/test/integration/bitswap_wo_routing_test.go @@ -7,9 +7,9 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/core" - coremock "github.com/ipfs/go-ipfs/core/mock" - "github.com/ipfs/go-ipfs/core/node/libp2p" + "github.com/ipfs/ipfs-banana/core" + coremock "github.com/ipfs/ipfs-banana/core/mock" + "github.com/ipfs/ipfs-banana/core/node/libp2p" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" ) diff --git a/test/integration/three_legged_cat_test.go b/test/integration/three_legged_cat_test.go index 009d1af32d64..7700669906ef 100644 --- a/test/integration/three_legged_cat_test.go +++ b/test/integration/three_legged_cat_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - bootstrap2 "github.com/ipfs/go-ipfs/core/bootstrap" - "github.com/ipfs/go-ipfs/core/coreapi" - mock "github.com/ipfs/go-ipfs/core/mock" - "github.com/ipfs/go-ipfs/thirdparty/unit" + bootstrap2 "github.com/ipfs/ipfs-banana/core/bootstrap" + "github.com/ipfs/ipfs-banana/core/coreapi" + mock "github.com/ipfs/ipfs-banana/core/mock" + "github.com/ipfs/ipfs-banana/thirdparty/unit" files "github.com/ipfs/go-ipfs-files" "github.com/libp2p/go-libp2p-core/peer" diff --git a/test/integration/wan_lan_dht_test.go b/test/integration/wan_lan_dht_test.go index 44305e051741..8ac907d08fe3 100644 --- a/test/integration/wan_lan_dht_test.go +++ b/test/integration/wan_lan_dht_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/core" - mock "github.com/ipfs/go-ipfs/core/mock" - libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p" + "github.com/ipfs/ipfs-banana/core" + mock "github.com/ipfs/ipfs-banana/core/mock" + libp2p2 "github.com/ipfs/ipfs-banana/core/node/libp2p" corenet "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peerstore" diff --git a/test/sharness/t0280-plugin-data/example.go b/test/sharness/t0280-plugin-data/example.go index 87b96249ad29..1673fce65ad1 100644 --- a/test/sharness/t0280-plugin-data/example.go +++ b/test/sharness/t0280-plugin-data/example.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/ipfs/go-ipfs/plugin" + "github.com/ipfs/ipfs-banana/plugin" ) var Plugins = []plugin.Plugin{ diff --git a/tracing/tracing.go b/tracing/tracing.go index 99b340236f59..3efe4ef828f7 100644 --- a/tracing/tracing.go +++ b/tracing/tracing.go @@ -7,7 +7,7 @@ import ( "path" "strings" - version "github.com/ipfs/go-ipfs" + version "github.com/ipfs/ipfs-banana" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" diff --git a/version.go b/version.go index e4476149d3f0..bac8b775e66f 100644 --- a/version.go +++ b/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/ipfs-banana/repo/fsrepo" ) // CurrentCommit is the current git commit, this is set as a ldflag in the Makefile