diff --git a/.circleci/main.yml b/.circleci/main.yml index 895b709a7..af2de0d58 100644 --- a/.circleci/main.yml +++ b/.circleci/main.yml @@ -119,11 +119,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/kubo=./../../.. 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/kubo/config";' ./main.go go test -v ./... diff --git a/README.md b/README.md index 5fc7b395f..901d0d0af 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,27 @@ -# go-ipfs +# kubo -![banner](https://ipfs.io/ipfs/bafykbzacecaesuqmivkauix25v6i6xxxsvsrtxknhgb5zak3xxsg2nb4dhs2u/ipfs.go.png) +![kubo](https://user-images.githubusercontent.com/157609/167471494-dee3a355-b551-4fbf-98e0-2eb76e867b48.png) [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square&cacheSeconds=3600)](https://protocol.ai) [![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4.svg?style=flat-square&cacheSeconds=3600)](https://godoc.org/github.com/ipfs/go-ipfs) [![CircleCI](https://img.shields.io/circleci/build/github/ipfs/go-ipfs?style=flat-square&cacheSeconds=3600)](https://circleci.com/gh/ipfs/go-ipfs) +## What is "IPFS Banana"? + +This repo provides "jack of all trades, master of none" implementation of IPFS. + +It should be enough to get you started, if you find it lacking, see [other implementations](https://ipfs.io/#install). + + ## What is IPFS? IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas from previous systems such as Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single BitTorrent swarm, exchanging git objects. IPFS provides an interface as simple as the HTTP web, but with permanence built-in. You can also mount the world at /ipfs. For more info see: https://docs.ipfs.io/introduction/overview/ + Before opening an issue, consider using one of the following locations to ensure you are opening your thread in the right place: - - go-ipfs _implementation_ bugs in [this repo](https://github.com/ipfs/go-ipfs/issues). + - kubo (previously named go-ipfs) _implementation_ bugs in [this repo](https://github.com/ipfs/go-ipfs/issues). - Documentation issues in [ipfs/docs issues](https://github.com/ipfs/ipfs-docs/issues). - IPFS _design_ in [ipfs/specs issues](https://github.com/ipfs/specs/issues). - Exploration of new ideas in [ipfs/notes issues](https://github.com/ipfs/notes/issues). @@ -35,48 +43,53 @@ Before opening an issue, consider using one of the following locations to ensure ## Table of Contents -- [Security Issues](#security-issues) -- [Install](#install) - - [System Requirements](#system-requirements) - - [Docker](#docker) - - [Native Linux package managers](#native-linux-package-managers) - - [ArchLinux](#archlinux) - - [Nix](#nix-linux) - - [Solus](#solus) - - [openSUSE](#opensuse) - - [Other package managers](#other-package-managers) - - [Guix](#guix) - - [Snap](#snap) - - [macOS package managers](#macos-package-managers) - - [MacPorts](#macports) - - [Nix](#nix-macos) - - [Homebrew](#homebrew) - - [Windows package managers](#windows-package-managers) - - [Chocolatey](#chocolatey) - - [Scoop](#scoop) - - [Install prebuilt binaries](#install-prebuilt-binaries) - - [Build from Source](#build-from-source) - - [Install Go](#install-go) - - [Download and Compile IPFS](#download-and-compile-ipfs) - - [Cross Compiling](#cross-compiling) - - [OpenSSL](#openssl) - - [Troubleshooting](#troubleshooting) - - [Updating go-ipfs](#updating-go-ipfs) - - [Using ipfs-update](#using-ipfs-update) - - [Downloading IPFS builds using IPFS](#downloading-ipfs-builds-using-ipfs) -- [Getting Started](#getting-started) - - [Usage](#usage) - - [Some things to try](#some-things-to-try) - - [Troubleshooting](#troubleshooting-1) -- [Packages](#packages) -- [Development](#development) - - [Map of go-ipfs Subsystems](#map-of-go-ipfs-subsystems) - - [CLI, HTTP-API, Architecture Diagram](#cli-http-api-architecture-diagram) - - [Testing](#testing) - - [Development Dependencies](#development-dependencies) - - [Developer Notes](#developer-notes) -- [Contributing](#contributing) -- [License](#license) +- [kubo](#kubo) + - [What is "IPFS Banana"?](#what-is-ipfs-banana) + - [What is IPFS?](#what-is-ipfs) + - [Next milestones](#next-milestones) + - [Table of Contents](#table-of-contents) + - [Security Issues](#security-issues) + - [Install](#install) + - [System Requirements](#system-requirements) + - [Docker](#docker) + - [Native Linux package managers](#native-linux-package-managers) + - [ArchLinux](#archlinux) + - [Nix](#nix) + - [Solus](#solus) + - [openSUSE](#opensuse) + - [Other package managers](#other-package-managers) + - [Guix](#guix) + - [Snap](#snap) + - [macOS package managers](#macos-package-managers) + - [MacPorts](#macports) + - [Nix](#nix-1) + - [Homebrew](#homebrew) + - [Windows package managers](#windows-package-managers) + - [Chocolatey](#chocolatey) + - [Scoop](#scoop) + - [Install prebuilt binaries](#install-prebuilt-binaries) + - [Build from Source](#build-from-source) + - [Install Go](#install-go) + - [Download and Compile IPFS](#download-and-compile-ipfs) + - [Cross Compiling](#cross-compiling) + - [OpenSSL](#openssl) + - [Troubleshooting](#troubleshooting) + - [Updating](#updating) + - [Using ipfs-update](#using-ipfs-update) + - [Downloading builds using IPFS](#downloading-builds-using-ipfs) + - [Getting Started](#getting-started) + - [Usage](#usage) + - [Some things to try](#some-things-to-try) + - [Troubleshooting](#troubleshooting-1) + - [Packages](#packages) + - [Development](#development) + - [Map of Implemented Subsystems](#map-of-implemented-subsystems) + - [CLI, HTTP-API, Architecture Diagram](#cli-http-api-architecture-diagram) + - [Testing](#testing) + - [Development Dependencies](#development-dependencies) + - [Developer Notes](#developer-notes) + - [Contributing](#contributing) + - [License](#license) ## Security Issues @@ -310,7 +323,7 @@ dependencies as well. - Shell command completions can be generated with one of the `ipfs commands completion` subcommands. Read [docs/command-completion.md](docs/command-completion.md) to learn more. - See the [misc folder](https://github.com/ipfs/go-ipfs/tree/master/misc) for how to connect IPFS to systemd or whatever init system your distro uses. -### Updating go-ipfs +### Updating #### Using ipfs-update @@ -318,9 +331,11 @@ IPFS has an updating tool that can be accessed through `ipfs update`. The tool i not installed alongside IPFS in order to keep that logic independent of the main codebase. To install `ipfs update`, [download it here](https://ipfs.io/ipns/dist.ipfs.io/#ipfs-update). -#### Downloading IPFS builds using IPFS +#### Downloading builds using IPFS -List the available versions of go-ipfs: + + +List the available versions of "go-ipfs" implementation: ``` $ ipfs cat /ipns/dist.ipfs.io/go-ipfs/versions @@ -454,8 +469,8 @@ Some places to get you started on the codebase: - PubSub: https://github.com/libp2p/go-libp2p-pubsub - [IPFS : The `Add` command demystified](https://github.com/ipfs/go-ipfs/tree/master/docs/add-code-flow.md) -### Map of go-ipfs Subsystems -**WIP**: This is a high-level architecture diagram of the various sub-systems of go-ipfs. To be updated with how they interact. Anyone who has suggestions is welcome to comment [here](https://docs.google.com/drawings/d/1OVpBT2q-NtSJqlPX3buvjYhOnWfdzb85YEsM_njesME/edit) on how we can improve this! +### Map of Implemented Subsystems +**WIP**: This is a high-level architecture diagram of the various sub-systems of this specific implementation. To be updated with how they interact. Anyone who has suggestions is welcome to comment [here](https://docs.google.com/drawings/d/1OVpBT2q-NtSJqlPX3buvjYhOnWfdzb85YEsM_njesME/edit) on how we can improve this! ### CLI, HTTP-API, Architecture Diagram @@ -492,7 +507,7 @@ Please reach out to us in one [chat](https://docs.ipfs.io/community/chat/) rooms ## License -The go-ipfs project is dual-licensed under Apache 2.0 and MIT terms: +This project is dual-licensed under Apache 2.0 and MIT terms: - Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/ipfs/go-ipfs/blob/master/LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - MIT license ([LICENSE-MIT](https://github.com/ipfs/go-ipfs/blob/master/LICENSE-MIT) or http://opensource.org/licenses/MIT) diff --git a/assets/assets.go b/assets/assets.go index ff87eec12..cf3418cb0 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/kubo/core" + "github.com/ipfs/kubo/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 2a768b5fc..969405131 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/kubo".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/kubo) $(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 c4e29b8e4..0c78d215b 100644 --- a/cmd/ipfs/add_migrations.go +++ b/cmd/ipfs/add_migrations.go @@ -9,13 +9,13 @@ 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" 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" + "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/coreapi" + "github.com/ipfs/kubo/repo/fsrepo/migrations" + "github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher" "github.com/libp2p/go-libp2p-core/peer" ) @@ -36,7 +36,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/kubo/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 b817bb039..8d3379315 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -15,21 +15,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/kubo" + utilmain "github.com/ipfs/kubo/cmd/ipfs/util" + oldcmds "github.com/ipfs/kubo/commands" + config "github.com/ipfs/kubo/config" + cserial "github.com/ipfs/kubo/config/serialize" + "github.com/ipfs/kubo/core" + commands "github.com/ipfs/kubo/core/commands" + "github.com/ipfs/kubo/core/coreapi" + corehttp "github.com/ipfs/kubo/core/corehttp" + corerepo "github.com/ipfs/kubo/core/corerepo" + libp2p "github.com/ipfs/kubo/core/node/libp2p" + nodeMount "github.com/ipfs/kubo/fuse/node" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" + "github.com/ipfs/kubo/repo/fsrepo/migrations" + "github.com/ipfs/kubo/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/kubo/issues/7702") } node, err := cctx.ConstructNode() diff --git a/cmd/ipfs/debug.go b/cmd/ipfs/debug.go index 5eeb590e2..f1b2683d1 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/kubo/profile" ) func init() { diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index dfbf01bb3..b312fcb49 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -10,18 +10,18 @@ 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" path "github.com/ipfs/go-path" unixfs "github.com/ipfs/go-unixfs" + assets "github.com/ipfs/kubo/assets" + oldcmds "github.com/ipfs/kubo/commands" + core "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/commands" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" cmds "github.com/ipfs/go-ipfs-cmds" files "github.com/ipfs/go-ipfs-files" - config "github.com/ipfs/go-ipfs/config" options "github.com/ipfs/interface-go-ipfs-core/options" + config "github.com/ipfs/kubo/config" ) const ( diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 6abe3f5e4..6b30a0fc8 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/kubo/core/commands" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 6147a0cbf..83cc81fca 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/kubo/cmd/ipfs/util" + oldcmds "github.com/ipfs/kubo/commands" + core "github.com/ipfs/kubo/core" + corecmds "github.com/ipfs/kubo/core/commands" + corehttp "github.com/ipfs/kubo/core/corehttp" + loader "github.com/ipfs/kubo/plugin/loader" + repo "github.com/ipfs/kubo/repo" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" + "github.com/ipfs/kubo/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 021b0530b..6deeba2f0 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/kubo/config" + "github.com/ipfs/kubo/core" ) // mfslog is the logger for remote mfs pinning diff --git a/cmd/ipfs/pinmfs_test.go b/cmd/ipfs/pinmfs_test.go index 2c79c2043..262dd3f4a 100644 --- a/cmd/ipfs/pinmfs_test.go +++ b/cmd/ipfs/pinmfs_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - config "github.com/ipfs/go-ipfs/config" ipld "github.com/ipfs/go-ipld-format" merkledag "github.com/ipfs/go-merkledag" + config "github.com/ipfs/kubo/config" "github.com/libp2p/go-libp2p-core/host" peer "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/cmd/ipfswatch/ipfswatch_test.go b/cmd/ipfswatch/ipfswatch_test.go index b5a41c6bc..20397afef 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/kubo/thirdparty/assert" ) func TestIsHidden(t *testing.T) { diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 9ffc6f62e..d555f14b9 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/kubo/commands" + core "github.com/ipfs/kubo/core" + coreapi "github.com/ipfs/kubo/core/coreapi" + corehttp "github.com/ipfs/kubo/core/corehttp" + fsrepo "github.com/ipfs/kubo/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 be768f54a..64e6ec55d 100644 --- a/commands/context.go +++ b/commands/context.go @@ -6,15 +6,15 @@ 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/kubo/core" + coreapi "github.com/ipfs/kubo/core/coreapi" + loader "github.com/ipfs/kubo/plugin/loader" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" logging "github.com/ipfs/go-log" coreiface "github.com/ipfs/interface-go-ipfs-core" options "github.com/ipfs/interface-go-ipfs-core/options" + config "github.com/ipfs/kubo/config" ) var log = logging.Logger("command") diff --git a/config/experiments.go b/config/experiments.go index dba0ea713..a576a5b61 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/kubo/pull/8527 GraphsyncEnabled bool Libp2pStreamMounting bool P2pHttpProxy bool diff --git a/config/gateway.go b/config/gateway.go index 486089b71..574a7e3df 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/kubo/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 e51e92115..d20e48118 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/kubo/config" "github.com/facebookgo/atomicfile" ) diff --git a/config/serialize/serialize_test.go b/config/serialize/serialize_test.go index 0c8e12f40..cc161c80d 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/kubo/config" ) func TestConfig(t *testing.T) { diff --git a/core/builder.go b/core/builder.go index c6bb99192..2b84c6d83 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/kubo/core/bootstrap" + "github.com/ipfs/kubo/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 34a2c9b9c..786075f01 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/kubo/commands" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/core/commands/add.go b/core/commands/add.go index 83534493e..c2d73f8de 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/kubo/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 095d7d5b5..bb738ca6f 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/kubo/core/commands/cmdenv" + e "github.com/ipfs/kubo/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 92e5f9cb3..b0591b002 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/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/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 d572e8c07..40ee49381 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/kubo/core/commands/cmdenv" + repo "github.com/ipfs/kubo/repo" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/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 98a0e41bd..151ac126e 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/kubo/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 ecce83278..48cbf2b03 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/kubo/commands" + "github.com/ipfs/kubo/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 ebbbca64e..f4b6b40f4 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/kubo/issues/7421#issuecomment-910833499 ) var AllowBigBlockOption cmds.Option diff --git a/core/commands/commands.go b/core/commands/commands.go index 27be029c0..5f49c8b0d 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/kubo/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 d929e9ab6..035826114 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -9,13 +9,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/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/repo/fsrepo" "github.com/elgris/jsondiff" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" ) // ConfigUpdateOutput is config profile apply command's output diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index d5d7479f2..1661c3818 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/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/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 8de39c532..14e982bcc 100644 --- a/core/commands/dag/export.go +++ b/core/commands/dag/export.go @@ -11,9 +11,9 @@ 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" ipld "github.com/ipfs/go-ipld-format" iface "github.com/ipfs/interface-go-ipfs-core" + "github.com/ipfs/kubo/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" gocar "github.com/ipld/go-car" diff --git a/core/commands/dag/get.go b/core/commands/dag/get.go index 546ba4e5d..79ad98a49 100644 --- a/core/commands/dag/get.go +++ b/core/commands/dag/get.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" ipldlegacy "github.com/ipfs/go-ipld-legacy" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/core/commands/cmdenv" "github.com/ipld/go-ipld-prime" "github.com/ipld/go-ipld-prime/multicodec" diff --git a/core/commands/dag/import.go b/core/commands/dag/import.go index 77d688ca9..35b3e4764 100644 --- a/core/commands/dag/import.go +++ b/core/commands/dag/import.go @@ -7,11 +7,11 @@ 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" ipld "github.com/ipfs/go-ipld-format" iface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/options" + "github.com/ipfs/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/core/commands/cmdutils" cmds "github.com/ipfs/go-ipfs-cmds" gocarv2 "github.com/ipld/go-car/v2" diff --git a/core/commands/dag/put.go b/core/commands/dag/put.go index e741f1112..d8dbaa3f1 100644 --- a/core/commands/dag/put.go +++ b/core/commands/dag/put.go @@ -6,9 +6,9 @@ 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" ipldlegacy "github.com/ipfs/go-ipld-legacy" + "github.com/ipfs/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/core/commands/cmdutils" "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 836138368..9b5ae2ccd 100644 --- a/core/commands/dag/resolve.go +++ b/core/commands/dag/resolve.go @@ -1,8 +1,8 @@ package dagcmd import ( - "github.com/ipfs/go-ipfs/core/commands/cmdenv" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/core/commands/dag/stat.go b/core/commands/dag/stat.go index 3e3336f23..fa573f57d 100644 --- a/core/commands/dag/stat.go +++ b/core/commands/dag/stat.go @@ -5,10 +5,10 @@ import ( "io" "os" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" - "github.com/ipfs/go-ipfs/core/commands/e" "github.com/ipfs/go-merkledag/traverse" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/core/commands/e" cmds "github.com/ipfs/go-ipfs-cmds" mdag "github.com/ipfs/go-merkledag" diff --git a/core/commands/dht.go b/core/commands/dht.go index 268ad21b1..79e8580a1 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -8,7 +8,7 @@ import ( "io" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/kubo/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 8fccadf67..81854e1c1 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - ncmd "github.com/ipfs/go-ipfs/core/commands/name" namesys "github.com/ipfs/go-namesys" nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + ncmd "github.com/ipfs/kubo/core/commands/name" cmds "github.com/ipfs/go-ipfs-cmds" ) @@ -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/kubo/issues/8607 Helptext: cmds.HelpText{ Tagline: "Resolve DNSLink records.", ShortDescription: ` diff --git a/core/commands/files.go b/core/commands/files.go index 4c403f768..95432ef61 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/kubo/core" + "github.com/ipfs/kubo/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 03024eb5f..7a271526b 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/kubo/core" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + e "github.com/ipfs/kubo/core/commands/e" "github.com/ipfs/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 7f687ed22..85bb43a57 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/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/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 8920c9092..450fe7845 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/kubo" + core "github.com/ipfs/kubo/core" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" - ke "github.com/ipfs/go-ipfs/core/commands/keyencode" + ke "github.com/ipfs/kubo/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 a771445a7..0e5fcec76 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -14,14 +14,14 @@ 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" options "github.com/ipfs/interface-go-ipfs-core/options" + oldcmds "github.com/ipfs/kubo/commands" + config "github.com/ipfs/kubo/config" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/core/commands/e" + ke "github.com/ipfs/kubo/core/commands/keyencode" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" + migrations "github.com/ipfs/kubo/repo/fsrepo/migrations" "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 1a7b0c3fc..a8d01a594 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/kubo/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 fd1c486ee..52a1b843b 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/kubo/commands" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + nodeMount "github.com/ipfs/kubo/fuse/node" cmds "github.com/ipfs/go-ipfs-cmds" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" ) const ( diff --git a/core/commands/multibase.go b/core/commands/multibase.go index e3123d58e..be8d613f2 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/kubo/core/commands/cmdenv" mbase "github.com/multiformats/go-multibase" ) diff --git a/core/commands/name/ipns.go b/core/commands/name/ipns.go index 885c46924..3c6935331 100644 --- a/core/commands/name/ipns.go +++ b/core/commands/name/ipns.go @@ -7,8 +7,8 @@ import ( "strings" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" namesys "github.com/ipfs/go-namesys" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" logging "github.com/ipfs/go-log" diff --git a/core/commands/name/ipnsps.go b/core/commands/name/ipnsps.go index 949ea43d5..ae580a4fd 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/kubo/core/commands/cmdenv" + ke "github.com/ipfs/kubo/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 e220efa7f..bf4c5e137 100644 --- a/core/commands/name/publish.go +++ b/core/commands/name/publish.go @@ -6,13 +6,13 @@ import ( "io" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" cmds "github.com/ipfs/go-ipfs-cmds" - ke "github.com/ipfs/go-ipfs/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" + ke "github.com/ipfs/kubo/core/commands/keyencode" peer "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index 54727cd28..8d3caafc5 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/kubo/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/kubo/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 6130a8e50..332d28f56 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" cmds "github.com/ipfs/go-ipfs-cmds" - "github.com/ipfs/go-ipfs/core/commands/cmdenv" + "github.com/ipfs/kubo/core/commands/cmdenv" humanize "github.com/dustin/go-humanize" "github.com/ipfs/go-cid" @@ -46,7 +46,7 @@ const ( ) var ObjectCmd = &cmds.Command{ - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated commands to interact with dag-pb objects. Use 'dag' or 'files' instead.", ShortDescription: ` @@ -68,7 +68,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/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to read the raw bytes of a dag-pb object: use 'dag get' instead.", ShortDescription: ` @@ -108,7 +108,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/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to output links in the specified dag-pb object: use 'dag get' instead.", ShortDescription: ` @@ -183,7 +183,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/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to get and serialize the dag-pb node. Use 'dag get' instead", ShortDescription: ` @@ -275,7 +275,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/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to read stats for the dag-pb node. Use 'files stat' instead.", ShortDescription: ` @@ -375,7 +375,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/kubo/issues/7936 Helptext: cmds.HelpText{ Tagline: "Deprecated way to store input as a DAG object. Use 'dag put' instead.", ShortDescription: ` @@ -455,7 +455,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/kubo/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 6843b2267..6368562bc 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/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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 e9c32626b..44e768c05 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/kubo/core" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + p2p "github.com/ipfs/kubo/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 0344932f6..89e56f687 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/kubo/core" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + e "github.com/ipfs/kubo/core/commands/e" ) var PinCmd = &cmds.Command{ diff --git a/core/commands/pin/remotepin.go b/core/commands/pin/remotepin.go index 495a14003..4a03e30d5 100644 --- a/core/commands/pin/remotepin.go +++ b/core/commands/pin/remotepin.go @@ -17,12 +17,12 @@ 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" logging "github.com/ipfs/go-log" pinclient "github.com/ipfs/go-pinning-service-http-client" path "github.com/ipfs/interface-go-ipfs-core/path" + config "github.com/ipfs/kubo/config" + "github.com/ipfs/kubo/core/commands/cmdenv" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" "github.com/libp2p/go-libp2p-core/host" peer "github.com/libp2p/go-libp2p-core/peer" ) @@ -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/kubo/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 3c48018a7..49b177414 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/kubo/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 a5567fc81..3875cfdcb 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/kubo/core/commands/e" + "github.com/ipfs/kubo/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/kubo/blob/master/docs/debug-guide.md. Privacy Notice: diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index d6213cc7e..ef8afcb44 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -7,7 +7,7 @@ import ( "net/http" "sort" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" mbase "github.com/multiformats/go-multibase" "github.com/pkg/errors" @@ -336,7 +336,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/kubo/issues/7939) func urlArgsEncoder(req *cmds.Request, env cmds.Environment) error { encoder, _ := mbase.EncoderByName("base64url") for n, arg := range req.Arguments { @@ -346,7 +346,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/kubo/issues/7939) func urlArgsDecoder(req *cmds.Request, env cmds.Environment) error { for n, arg := range req.Arguments { encoding, data, err := mbase.Decode(arg) @@ -355,7 +355,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/kubo/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 84dcdb25b..ad982aaed 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/kubo/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 3824b972e..b1a4c9180 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/kubo/commands" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + corerepo "github.com/ipfs/kubo/core/corerepo" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" + "github.com/ipfs/kubo/repo/fsrepo/migrations" + "github.com/ipfs/kubo/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/kubo/issues/6435 Helptext: cmds.HelpText{ Tagline: "Remove repo lockfiles.", ShortDescription: ` diff --git a/core/commands/resolve.go b/core/commands/resolve.go index fb87d1c02..3bdd6924e 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -7,9 +7,9 @@ import ( "strings" "time" - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - ncmd "github.com/ipfs/go-ipfs/core/commands/name" ns "github.com/ipfs/go-namesys" + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv" + ncmd "github.com/ipfs/kubo/core/commands/name" cidenc "github.com/ipfs/go-cidutil/cidenc" cmds "github.com/ipfs/go-ipfs-cmds" diff --git a/core/commands/root.go b/core/commands/root.go index 71ec35e37..47fe1f095 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/kubo/core/commands/cmdenv" + dag "github.com/ipfs/kubo/core/commands/dag" + name "github.com/ipfs/kubo/core/commands/name" + ocmd "github.com/ipfs/kubo/core/commands/object" + "github.com/ipfs/kubo/core/commands/pin" + unixfs "github.com/ipfs/kubo/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 4d4adad03..263598843 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/kubo/core/commands/cmdenv" ) var daemonShutdownCmd = &cmds.Command{ diff --git a/core/commands/stat.go b/core/commands/stat.go index e38b5b31b..924f0942d 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/kubo/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 c76fce2c0..b00bd1e26 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/kubo/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 4224efcaf..e192944d6 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/kubo/core/commands/cmdenv" "github.com/ipfs/go-ipfs-provider/batched" ) diff --git a/core/commands/swarm.go b/core/commands/swarm.go index fcf2a5034..ec9098c30 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/kubo/commands" + "github.com/ipfs/kubo/config" + "github.com/ipfs/kubo/core/commands/cmdenv" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/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 f512ae3b3..123dcb973 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/kubo" + "github.com/ipfs/kubo/core" + cmdenv "github.com/ipfs/kubo/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 4dcb22be8..eaec9ab68 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/kubo/core/commands/cmdenv" + tar "github.com/ipfs/kubo/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/kubo/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/kubo/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/kubo/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 ac012b04f..dc4221eb6 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/kubo/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/kubo/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 cb5c8ddaf..b50d08d92 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/kubo/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 0b7dcbc5f..bd67c56ff 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/kubo/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 93ec5dd87..6a318aa3e 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/kubo" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/core/core.go b/core/core.go index 1a09b85e8..5f95de692 100644 --- a/core/core.go +++ b/core/core.go @@ -43,15 +43,15 @@ 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/go-namesys" ipnsrp "github.com/ipfs/go-namesys/republisher" + "github.com/ipfs/kubo/core/bootstrap" + "github.com/ipfs/kubo/core/node" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/fuse/mount" + "github.com/ipfs/kubo/p2p" + "github.com/ipfs/kubo/peering" + "github.com/ipfs/kubo/repo" ) var log = logging.Logger("core") diff --git a/core/core_test.go b/core/core_test.go index e1563789e..42dd543d7 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/kubo/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/kubo/config" ) func TestInitialization(t *testing.T) { diff --git a/core/coreapi/block.go b/core/coreapi/block.go index 45d8bcf42..886a21bf4 100644 --- a/core/coreapi/block.go +++ b/core/coreapi/block.go @@ -15,8 +15,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/kubo/blocks/blockstoreutil" + "github.com/ipfs/kubo/tracing" ) type BlockAPI CoreAPI diff --git a/core/coreapi/coreapi.go b/core/coreapi/coreapi.go index 3d31abaab..a2cd43e9a 100644 --- a/core/coreapi/coreapi.go +++ b/core/coreapi/coreapi.go @@ -39,10 +39,10 @@ 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/go-namesys" + "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/node" + "github.com/ipfs/kubo/repo" ) type CoreAPI struct { diff --git a/core/coreapi/dag.go b/core/coreapi/dag.go index 696c5bab7..0f38fc4d5 100644 --- a/core/coreapi/dag.go +++ b/core/coreapi/dag.go @@ -5,9 +5,9 @@ import ( cid "github.com/ipfs/go-cid" pin "github.com/ipfs/go-ipfs-pinner" - "github.com/ipfs/go-ipfs/tracing" ipld "github.com/ipfs/go-ipld-format" dag "github.com/ipfs/go-merkledag" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go index c196aba9b..dc206a836 100644 --- a/core/coreapi/dht.go +++ b/core/coreapi/dht.go @@ -9,11 +9,11 @@ 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" dag "github.com/ipfs/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" path "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" peer "github.com/libp2p/go-libp2p-core/peer" routing "github.com/libp2p/go-libp2p-core/routing" "go.opentelemetry.io/otel/attribute" diff --git a/core/coreapi/key.go b/core/coreapi/key.go index 1468e6c0c..fd5e689a4 100644 --- a/core/coreapi/key.go +++ b/core/coreapi/key.go @@ -7,11 +7,11 @@ import ( "fmt" "sort" - "github.com/ipfs/go-ipfs/tracing" ipfspath "github.com/ipfs/go-path" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" path "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" crypto "github.com/libp2p/go-libp2p-core/crypto" peer "github.com/libp2p/go-libp2p-core/peer" "go.opentelemetry.io/otel/attribute" diff --git a/core/coreapi/name.go b/core/coreapi/name.go index e39c05d0f..0720b944c 100644 --- a/core/coreapi/name.go +++ b/core/coreapi/name.go @@ -7,8 +7,8 @@ import ( "time" keystore "github.com/ipfs/go-ipfs-keystore" - "github.com/ipfs/go-ipfs/tracing" "github.com/ipfs/go-namesys" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/core/coreapi/object.go b/core/coreapi/object.go index 05b21324f..d2bd08add 100644 --- a/core/coreapi/object.go +++ b/core/coreapi/object.go @@ -12,7 +12,6 @@ import ( cid "github.com/ipfs/go-cid" pin "github.com/ipfs/go-ipfs-pinner" - "github.com/ipfs/go-ipfs/tracing" ipld "github.com/ipfs/go-ipld-format" dag "github.com/ipfs/go-merkledag" "github.com/ipfs/go-merkledag/dagutils" @@ -20,6 +19,7 @@ import ( coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/core/coreapi/path.go b/core/coreapi/path.go index 5f2b41007..c890ade6e 100644 --- a/core/coreapi/path.go +++ b/core/coreapi/path.go @@ -5,8 +5,8 @@ import ( "fmt" gopath "path" - "github.com/ipfs/go-ipfs/tracing" "github.com/ipfs/go-namesys/resolve" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go index 51667c4b7..41327c8c3 100644 --- a/core/coreapi/pin.go +++ b/core/coreapi/pin.go @@ -8,11 +8,11 @@ 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/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/core/coreapi/pubsub.go b/core/coreapi/pubsub.go index 99658b599..d5e56ce60 100644 --- a/core/coreapi/pubsub.go +++ b/core/coreapi/pubsub.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/ipfs/go-ipfs/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" + "github.com/ipfs/kubo/tracing" peer "github.com/libp2p/go-libp2p-core/peer" routing "github.com/libp2p/go-libp2p-core/routing" pubsub "github.com/libp2p/go-libp2p-pubsub" diff --git a/core/coreapi/swarm.go b/core/coreapi/swarm.go index ea1aa423b..34f905de5 100644 --- a/core/coreapi/swarm.go +++ b/core/coreapi/swarm.go @@ -5,8 +5,8 @@ import ( "sort" "time" - "github.com/ipfs/go-ipfs/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" + "github.com/ipfs/kubo/tracing" inet "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" pstore "github.com/libp2p/go-libp2p-core/peerstore" diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go index b8eed6102..dac37f5f4 100644 --- a/core/coreapi/test/api_test.go +++ b/core/coreapi/test/api_test.go @@ -10,18 +10,18 @@ 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/kubo/core" + "github.com/ipfs/kubo/core/bootstrap" + "github.com/ipfs/kubo/core/coreapi" + mock "github.com/ipfs/kubo/core/mock" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/repo" "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" - "github.com/ipfs/go-ipfs/config" coreiface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/tests" + "github.com/ipfs/kubo/config" "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go index b4e1bbc3e..e0fe0eb13 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/kubo/core" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-ipfs/core/coreunix" + "github.com/ipfs/kubo/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/kubo/blob/master/docs/experimental-features.md#ipfs-filestore") } addblockstore := api.blockstore diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 14b503ff5..b433dfea7 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -9,15 +9,15 @@ 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/kubo" + oldcmds "github.com/ipfs/kubo/commands" + "github.com/ipfs/kubo/core" + corecommands "github.com/ipfs/kubo/core/commands" cmds "github.com/ipfs/go-ipfs-cmds" cmdsHttp "github.com/ipfs/go-ipfs-cmds/http" - config "github.com/ipfs/go-ipfs/config" path "github.com/ipfs/go-path" + config "github.com/ipfs/kubo/config" ) var ( diff --git a/core/corehttp/corehttp.go b/core/corehttp/corehttp.go index 143327149..fe9f1b1db 100644 --- a/core/corehttp/corehttp.go +++ b/core/corehttp/corehttp.go @@ -11,8 +11,8 @@ import ( "net/http" "time" - core "github.com/ipfs/go-ipfs/core" logging "github.com/ipfs/go-log" + core "github.com/ipfs/kubo/core" "github.com/jbenet/goprocess" periodicproc "github.com/jbenet/goprocess/periodic" ma "github.com/multiformats/go-multiaddr" diff --git a/core/corehttp/gateway.go b/core/corehttp/gateway.go index 84ad13897..dcaf92f29 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/kubo" + core "github.com/ipfs/kubo/core" + coreapi "github.com/ipfs/kubo/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 f32fac54e..e7c6df4a6 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/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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/kubo/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 814ec9544..3bf7c76be 100644 --- a/core/corehttp/gateway_handler_block.go +++ b/core/corehttp/gateway_handler_block.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/ipfs/go-ipfs/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" "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 05c297664..3363c5199 100644 --- a/core/corehttp/gateway_handler_car.go +++ b/core/corehttp/gateway_handler_car.go @@ -8,9 +8,9 @@ import ( blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" - "github.com/ipfs/go-ipfs/tracing" coreiface "github.com/ipfs/interface-go-ipfs-core" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" gocar "github.com/ipld/go-car" selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" "go.opentelemetry.io/otel/attribute" @@ -71,7 +71,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/kubo/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 b318a641a..0aec83a8b 100644 --- a/core/corehttp/gateway_handler_unixfs.go +++ b/core/corehttp/gateway_handler_unixfs.go @@ -8,8 +8,8 @@ import ( "time" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" diff --git a/core/corehttp/gateway_handler_unixfs_dir.go b/core/corehttp/gateway_handler_unixfs_dir.go index 1e059200a..30e1b5ec7 100644 --- a/core/corehttp/gateway_handler_unixfs_dir.go +++ b/core/corehttp/gateway_handler_unixfs_dir.go @@ -11,12 +11,12 @@ 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" path "github.com/ipfs/go-path" "github.com/ipfs/go-path/resolver" options "github.com/ipfs/interface-go-ipfs-core/options" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/assets" + "github.com/ipfs/kubo/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" @@ -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/kubo/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/kubo/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 1852705fd..5053558dc 100644 --- a/core/corehttp/gateway_handler_unixfs_file.go +++ b/core/corehttp/gateway_handler_unixfs_file.go @@ -12,8 +12,8 @@ import ( "github.com/gabriel-vasile/mimetype" files "github.com/ipfs/go-ipfs-files" - "github.com/ipfs/go-ipfs/tracing" ipath "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" "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/kubo/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/kubo/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 6cc548cdc..1168d6556 100644 --- a/core/corehttp/gateway_indexPage.go +++ b/core/corehttp/gateway_indexPage.go @@ -6,8 +6,8 @@ import ( "path" "strings" - "github.com/ipfs/go-ipfs/assets" ipfspath "github.com/ipfs/go-path" + "github.com/ipfs/kubo/assets" ) // structs for directory listing diff --git a/core/corehttp/gateway_test.go b/core/corehttp/gateway_test.go index e3bc95a08..5f7cf0cb5 100644 --- a/core/corehttp/gateway_test.go +++ b/core/corehttp/gateway_test.go @@ -11,20 +11,20 @@ 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" namesys "github.com/ipfs/go-namesys" + version "github.com/ipfs/kubo" + core "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/coreapi" + repo "github.com/ipfs/kubo/repo" 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" path "github.com/ipfs/go-path" iface "github.com/ipfs/interface-go-ipfs-core" nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys" ipath "github.com/ipfs/interface-go-ipfs-core/path" + config "github.com/ipfs/kubo/config" ci "github.com/libp2p/go-libp2p-core/crypto" id "github.com/libp2p/go-libp2p/p2p/protocol/identify" ) diff --git a/core/corehttp/hostname.go b/core/corehttp/hostname.go index 93dde67ab..658eb34d4 100644 --- a/core/corehttp/hostname.go +++ b/core/corehttp/hostname.go @@ -10,18 +10,18 @@ import ( "strings" cid "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" namesys "github.com/ipfs/go-namesys" + core "github.com/ipfs/kubo/core" + coreapi "github.com/ipfs/kubo/core/coreapi" "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" 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" + config "github.com/ipfs/kubo/config" ) var defaultPaths = []string{"/ipfs/", "/ipns/", "/api/", "/p2p/"} @@ -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/kubo/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/kubo/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/kubo/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 df0f4f229..c2aa9b757 100644 --- a/core/corehttp/hostname_test.go +++ b/core/corehttp/hostname_test.go @@ -8,9 +8,9 @@ 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" path "github.com/ipfs/go-path" + config "github.com/ipfs/kubo/config" + coreapi "github.com/ipfs/kubo/core/coreapi" ) func TestToSubdomainURL(t *testing.T) { diff --git a/core/corehttp/logs.go b/core/corehttp/logs.go index 99e8fa885..944e62c5b 100644 --- a/core/corehttp/logs.go +++ b/core/corehttp/logs.go @@ -5,8 +5,8 @@ import ( "net" "net/http" - core "github.com/ipfs/go-ipfs/core" lwriter "github.com/ipfs/go-log/writer" + core "github.com/ipfs/kubo/core" ) type writeErrNotifier struct { diff --git a/core/corehttp/metrics.go b/core/corehttp/metrics.go index c3dbde0ac..4e2b81d13 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/kubo/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 fe37515d5..faa037b73 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/kubo/core" inet "github.com/libp2p/go-libp2p-core/network" bhost "github.com/libp2p/go-libp2p/p2p/host/basic" diff --git a/core/corehttp/mutex_profile.go b/core/corehttp/mutex_profile.go index a8265326c..bbaad5b3a 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/kubo/core" ) // MutexFractionOption allows to set runtime.SetMutexProfileFraction via HTTP diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go index 57f8d3b16..b401be9d5 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/kubo" ) type testcasecheckversion struct { diff --git a/core/corehttp/p2p_proxy.go b/core/corehttp/p2p_proxy.go index 1dee5055a..ebf754100 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/kubo/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 9f99463d9..48633a116 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/kubo/thirdparty/assert" protocol "github.com/libp2p/go-libp2p-core/protocol" ) diff --git a/core/corehttp/redirect.go b/core/corehttp/redirect.go index e7b961e60..5af596bd6 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/kubo/core" ) func RedirectOption(path string, redirect string) ServeOption { diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go index 5db45bf47..de3d16980 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/kubo/core" + "github.com/ipfs/kubo/gc" + "github.com/ipfs/kubo/repo" "github.com/dustin/go-humanize" "github.com/ipfs/go-cid" diff --git a/core/corerepo/stat.go b/core/corerepo/stat.go index 52a42ca8c..b39359cda 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/kubo/core" + fsrepo "github.com/ipfs/kubo/repo/fsrepo" humanize "github.com/dustin/go-humanize" ) diff --git a/core/coreunix/add.go b/core/coreunix/add.go index a0079b9eb..54e5873a9 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -14,7 +14,6 @@ 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" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" dag "github.com/ipfs/go-merkledag" @@ -25,6 +24,7 @@ import ( "github.com/ipfs/go-unixfs/importer/trickle" coreiface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/ipfs/kubo/tracing" ) var log = logging.Logger("coreunix") diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 4fb365c97..6d5d941f7 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -10,9 +10,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/kubo/core" + "github.com/ipfs/kubo/gc" + "github.com/ipfs/kubo/repo" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" @@ -22,9 +22,9 @@ 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" dag "github.com/ipfs/go-merkledag" coreiface "github.com/ipfs/interface-go-ipfs-core" + config "github.com/ipfs/kubo/config" ) const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe" diff --git a/core/coreunix/metadata.go b/core/coreunix/metadata.go index c9e93ced5..5454b213f 100644 --- a/core/coreunix/metadata.go +++ b/core/coreunix/metadata.go @@ -2,9 +2,9 @@ package coreunix import ( cid "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" dag "github.com/ipfs/go-merkledag" ft "github.com/ipfs/go-unixfs" + core "github.com/ipfs/kubo/core" ) func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) { diff --git a/core/coreunix/metadata_test.go b/core/coreunix/metadata_test.go index 31b60cfb9..f745ec5ff 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -7,11 +7,11 @@ import ( "testing" bserv "github.com/ipfs/go-blockservice" - core "github.com/ipfs/go-ipfs/core" merkledag "github.com/ipfs/go-merkledag" ft "github.com/ipfs/go-unixfs" importer "github.com/ipfs/go-unixfs/importer" uio "github.com/ipfs/go-unixfs/io" + core "github.com/ipfs/kubo/core" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" diff --git a/core/mock/mock.go b/core/mock/mock.go index d71024fe8..d861ac4ca 100644 --- a/core/mock/mock.go +++ b/core/mock/mock.go @@ -5,15 +5,15 @@ import ( "fmt" "io" - libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p" + libp2p2 "github.com/ipfs/kubo/core/node/libp2p" - "github.com/ipfs/go-ipfs/commands" - "github.com/ipfs/go-ipfs/core" - "github.com/ipfs/go-ipfs/repo" + "github.com/ipfs/kubo/commands" + "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/repo" "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/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 44698f921..10d1bd331 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/kubo/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/kubo/core/node/helpers" ) const ( - // Docs: https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#internalbitswap + // Docs: https://github.com/ipfs/kubo/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 689f151b1..ab015ffd2 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/kubo/core/node/helpers" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/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/kubo/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 c8305bb61..8aed8b05e 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/kubo/core/node/helpers" + "github.com/ipfs/kubo/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 2fc632763..d66cccc54 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/kubo/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 521a62a6a..3af1389d2 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/kubo/core/node/helpers" ) // Graphsync constructs a graphsync diff --git a/core/node/groups.go b/core/node/groups.go index 775fb00c0..937c73da1 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/go-log" + "github.com/ipfs/kubo/config" "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/kubo/core/node/libp2p" + "github.com/ipfs/kubo/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 a178ee332..d27085421 100644 --- a/core/node/ipns.go +++ b/core/node/ipns.go @@ -12,9 +12,9 @@ import ( "github.com/libp2p/go-libp2p-record" madns "github.com/multiformats/go-multiaddr-dns" - "github.com/ipfs/go-ipfs/repo" "github.com/ipfs/go-namesys" "github.com/ipfs/go-namesys/republisher" + "github.com/ipfs/kubo/repo" ) const DefaultIpnsCacheSize = 128 diff --git a/core/node/libp2p/discovery.go b/core/node/libp2p/discovery.go index bb6962051..8bc4273a2 100644 --- a/core/node/libp2p/discovery.go +++ b/core/node/libp2p/discovery.go @@ -10,7 +10,7 @@ import ( "go.uber.org/fx" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/kubo/core/node/helpers" ) const discoveryConnTimeout = time.Second * 30 diff --git a/core/node/libp2p/host.go b/core/node/libp2p/host.go index 9298f7ffb..fe6c61e16 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/kubo/core/node/helpers" + "github.com/ipfs/kubo/repo" "go.uber.org/fx" ) diff --git a/core/node/libp2p/libp2p.go b/core/node/libp2p/libp2p.go index 59e9a37d4..7b695781a 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/kubo" + config "github.com/ipfs/kubo/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 28560662d..fc72d7fb3 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/kubo/config" "github.com/libp2p/go-libp2p" ) diff --git a/core/node/libp2p/pnet.go b/core/node/libp2p/pnet.go index 4261e5e5e..8b5320080 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/kubo/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 e8b3e57fb..9b4b0a8ad 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/kubo/core/node/helpers" ) func FloodSub(pubsubOptions ...pubsub.Option) interface{} { diff --git a/core/node/libp2p/rcmgr.go b/core/node/libp2p/rcmgr.go index c6a4a5f48..fb1f6dc7f 100644 --- a/core/node/libp2p/rcmgr.go +++ b/core/node/libp2p/rcmgr.go @@ -8,10 +8,11 @@ import ( "strings" "github.com/benbjohnson/clock" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/core/node/helpers" - "github.com/ipfs/go-ipfs/repo" logging "github.com/ipfs/go-log/v2" + config "github.com/ipfs/kubo/config" + "github.com/ipfs/kubo/core/node/helpers" + "github.com/ipfs/kubo/repo" + "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" diff --git a/core/node/libp2p/rcmgr_defaults.go b/core/node/libp2p/rcmgr_defaults.go index 3f754fce4..747824262 100644 --- a/core/node/libp2p/rcmgr_defaults.go +++ b/core/node/libp2p/rcmgr_defaults.go @@ -7,7 +7,7 @@ import ( "os" "strings" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/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 5bb8b946e..04082545e 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/kubo/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 9c7351318..a5f1de3a7 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/kubo/core/node/helpers" - config "github.com/ipfs/go-ipfs/config" - "github.com/ipfs/go-ipfs/repo" + config "github.com/ipfs/kubo/config" + "github.com/ipfs/kubo/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 0881eaf2c..820ba22d6 100644 --- a/core/node/libp2p/sec.go +++ b/core/node/libp2p/sec.go @@ -1,7 +1,7 @@ package libp2p import ( - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/kubo/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/p2p/security/noise" diff --git a/core/node/libp2p/smux.go b/core/node/libp2p/smux.go index 3945112e7..64f3408f0 100644 --- a/core/node/libp2p/smux.go +++ b/core/node/libp2p/smux.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/kubo/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/network" diff --git a/core/node/libp2p/topicdiscovery.go b/core/node/libp2p/topicdiscovery.go index ce1b0d910..bdf5166a0 100644 --- a/core/node/libp2p/topicdiscovery.go +++ b/core/node/libp2p/topicdiscovery.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/p2p/discovery/backoff" disc "github.com/libp2p/go-libp2p/p2p/discovery/routing" - "github.com/ipfs/go-ipfs/core/node/helpers" + "github.com/ipfs/kubo/core/node/helpers" "go.uber.org/fx" ) diff --git a/core/node/libp2p/transport.go b/core/node/libp2p/transport.go index 978be5dce..3e069b664 100644 --- a/core/node/libp2p/transport.go +++ b/core/node/libp2p/transport.go @@ -3,7 +3,7 @@ package libp2p import ( "fmt" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/kubo/config" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/metrics" libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic" diff --git a/core/node/peering.go b/core/node/peering.go index b5e7caadc..fb2a1ee0f 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/kubo/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 3dd7f9b72..2c3836d8f 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/kubo/core/node/helpers" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/repo" ) const kReprovideFrequency = time.Hour * 12 diff --git a/core/node/storage.go b/core/node/storage.go index 6a647ffd7..2e831fae2 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/kubo/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/kubo/core/node/helpers" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/thirdparty/verifbs" ) // RepoConfig loads configuration from the repo diff --git a/fuse/ipns/common.go b/fuse/ipns/common.go index 1b810eaa9..e70c50e79 100644 --- a/fuse/ipns/common.go +++ b/fuse/ipns/common.go @@ -3,10 +3,10 @@ package ipns import ( "context" - "github.com/ipfs/go-ipfs/core" nsys "github.com/ipfs/go-namesys" path "github.com/ipfs/go-path" ft "github.com/ipfs/go-unixfs" + "github.com/ipfs/kubo/core" ci "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index 08abb84d6..06bb0cdfe 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -15,8 +15,8 @@ import ( "bazil.org/fuse" - core "github.com/ipfs/go-ipfs/core" - coreapi "github.com/ipfs/go-ipfs/core/coreapi" + core "github.com/ipfs/kubo/core" + coreapi "github.com/ipfs/kubo/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 c59701146..c04cc45a4 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/kubo/core" + coreapi "github.com/ipfs/kubo/core/coreapi" + mount "github.com/ipfs/kubo/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 382f575e2..73fa86772 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/kubo/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/kubo/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/kubo/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/kubo/issues/177 +[2]: https://github.com/ipfs/kubo/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/kubo/issues/177 +[2]: https://github.com/ipfs/kubo/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/kubo/issues ` func darwinFuseCheckVersion(node *core.IpfsNode) error { diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go index a5433c8c3..e6f512f8e 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/kubo/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 d0db6f6b4..e9762a3e4 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/kubo/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/kubo/issues/5334).") } diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index 5019f2ab1..12313ae3e 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -13,9 +13,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/kubo/core" + ipns "github.com/ipfs/kubo/fuse/ipns" + mount "github.com/ipfs/kubo/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 852284357..84795b13d 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/kubo/core" + ipns "github.com/ipfs/kubo/fuse/ipns" + mount "github.com/ipfs/kubo/fuse/mount" + rofs "github.com/ipfs/kubo/fuse/readonly" logging "github.com/ipfs/go-log" ) diff --git a/fuse/node/mount_windows.go b/fuse/node/mount_windows.go index ce89deddb..33393f99a 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/kubo/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 c1456d949..7e79b9cf6 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -18,9 +18,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/kubo/core" + coreapi "github.com/ipfs/kubo/core/coreapi" + coremock "github.com/ipfs/kubo/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 719cb5ef2..87e4b33a7 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/kubo/core" + mount "github.com/ipfs/kubo/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 af961221c..a4d6f2513 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -14,7 +14,6 @@ import ( fuse "bazil.org/fuse" fs "bazil.org/fuse/fs" "github.com/ipfs/go-cid" - core "github.com/ipfs/go-ipfs/core" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" mdag "github.com/ipfs/go-merkledag" @@ -22,6 +21,7 @@ import ( "github.com/ipfs/go-path/resolver" ft "github.com/ipfs/go-unixfs" uio "github.com/ipfs/go-unixfs/io" + core "github.com/ipfs/kubo/core" ipldprime "github.com/ipld/go-ipld-prime" cidlink "github.com/ipld/go-ipld-prime/linking/cid" ) diff --git a/go.mod b/go.mod index 954ce2595..50007399e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ipfs/go-ipfs +module github.com/ipfs/kubo require ( bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc diff --git a/mk/golang.mk b/mk/golang.mk index 93753e5c1..0a75c547a 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/kubo/$(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/kubo/...) 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 cb4c2448d..2bbda0155 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/kubo/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 735eedc9d..15d93f3e6 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/kubo/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 26bb215f2..9de31a9eb 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/kubo/plugin" ) func init() { diff --git a/plugin/loader/load_noplugin.go b/plugin/loader/load_noplugin.go index 25b1c0c38..fc56b16a0 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/kubo/plugin" ) func init() { diff --git a/plugin/loader/load_unix.go b/plugin/loader/load_unix.go index 19ca49889..4a5dccb40 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/kubo/plugin" ) func init() { diff --git a/plugin/loader/loader.go b/plugin/loader/loader.go index 3c52a4105..116c3dfce 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/kubo/config" + cserialize "github.com/ipfs/kubo/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/kubo/core" + "github.com/ipfs/kubo/core/coreapi" + plugin "github.com/ipfs/kubo/plugin" + fsrepo "github.com/ipfs/kubo/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 17da3c2f7..6b1607dc5 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/kubo/plugin/plugins/badgerds" + pluginiplddagjose "github.com/ipfs/kubo/plugin/plugins/dagjose" + pluginflatfs "github.com/ipfs/kubo/plugin/plugins/flatfs" + pluginipldgit "github.com/ipfs/kubo/plugin/plugins/git" + pluginlevelds "github.com/ipfs/kubo/plugin/plugins/levelds" + pluginpeerlog "github.com/ipfs/kubo/plugin/plugins/peerlog" ) // DO NOT EDIT THIS FILE diff --git a/plugin/loader/preload.sh b/plugin/loader/preload.sh index 256a23bc9..91396021d 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/kubo/plugin/plugins/$plugin *" done fi } diff --git a/plugin/loader/preload_list b/plugin/loader/preload_list index 54b8dee6f..048f4fd28 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/kubo/plugin/plugins/git * +iplddagjose github.com/ipfs/kubo/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/kubo/plugin/plugins/badgerds * +flatfs github.com/ipfs/kubo/plugin/plugins/flatfs * +levelds github.com/ipfs/kubo/plugin/plugins/levelds * +peerlog github.com/ipfs/kubo/plugin/plugins/peerlog * diff --git a/plugin/plugins/badgerds/badgerds.go b/plugin/plugins/badgerds/badgerds.go index b998e7877..3d3f69061 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/kubo/plugin" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/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 6d3e35b3d..943214629 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/kubo/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 074cc590d..40b8b37d0 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/kubo/plugin" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/repo/fsrepo" flatfs "github.com/ipfs/go-ds-flatfs" ) diff --git a/plugin/plugins/git/git.go b/plugin/plugins/git/git.go index bc28084ff..2c56d8339 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/kubo/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 8e37bc3a5..ccb7c08f8 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/kubo/plugin" + "github.com/ipfs/kubo/repo" + "github.com/ipfs/kubo/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 b73722c2c..ee7d8a08f 100644 --- a/plugin/plugins/peerlog/peerlog.go +++ b/plugin/plugins/peerlog/peerlog.go @@ -5,9 +5,9 @@ import ( "sync/atomic" "time" - core "github.com/ipfs/go-ipfs/core" - plugin "github.com/ipfs/go-ipfs/plugin" logging "github.com/ipfs/go-log" + core "github.com/ipfs/kubo/core" + plugin "github.com/ipfs/kubo/plugin" event "github.com/libp2p/go-libp2p-core/event" network "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" diff --git a/profile/profile.go b/profile/profile.go index f043d5f6f..d15d51251 100644 --- a/profile/profile.go +++ b/profile/profile.go @@ -13,8 +13,8 @@ import ( "sync" "time" - version "github.com/ipfs/go-ipfs" "github.com/ipfs/go-log" + version "github.com/ipfs/kubo" ) const ( diff --git a/repo/common/common_test.go b/repo/common/common_test.go index 5f62b688c..b999db459 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/kubo/thirdparty/assert" ) func TestMapMergeDeepReturnsNew(t *testing.T) { diff --git a/repo/fsrepo/config_test.go b/repo/fsrepo/config_test.go index 76280353f..03af75a96 100644 --- a/repo/fsrepo/config_test.go +++ b/repo/fsrepo/config_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/ipfs/go-ipfs/plugin/loader" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/kubo/plugin/loader" + "github.com/ipfs/kubo/repo/fsrepo" - "github.com/ipfs/go-ipfs/config" + "github.com/ipfs/kubo/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 8cdf25fc2..0f60056aa 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/kubo/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 60b0f078a..cbe1a3113 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -12,18 +12,18 @@ 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/kubo/repo" + "github.com/ipfs/kubo/repo/common" + dir "github.com/ipfs/kubo/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" logging "github.com/ipfs/go-log" + config "github.com/ipfs/kubo/config" + serialize "github.com/ipfs/kubo/config/serialize" + "github.com/ipfs/kubo/repo/fsrepo/migrations" homedir "github.com/mitchellh/go-homedir" ma "github.com/multiformats/go-multiaddr" ) @@ -417,7 +417,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/kubo/blob/master/docs/datastores.md#flatfs.") } dsc, err := AnyDatastoreConfig(r.config.Datastore.Spec) @@ -541,7 +541,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/kubo/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 e35bb5495..7c7551d20 100644 --- a/repo/fsrepo/fsrepo_test.go +++ b/repo/fsrepo/fsrepo_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/ipfs/go-ipfs/thirdparty/assert" + "github.com/ipfs/kubo/thirdparty/assert" datastore "github.com/ipfs/go-datastore" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" ) // swap arg order diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go index 1d0237222..5ce723fb3 100644 --- a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go +++ b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go @@ -12,15 +12,15 @@ 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" 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" + "github.com/ipfs/kubo/config" + "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/coreapi" + "github.com/ipfs/kubo/core/node/libp2p" + "github.com/ipfs/kubo/repo/fsrepo" + "github.com/ipfs/kubo/repo/fsrepo/migrations" peer "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go index 4e882b7ad..f3a2a9313 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/kubo/plugin/loader" + "github.com/ipfs/kubo/repo/fsrepo/migrations" ) func init() { diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go index c38a5b9b4..9c556fe97 100644 --- a/repo/fsrepo/migrations/migrations.go +++ b/repo/fsrepo/migrations/migrations.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" ) const ( diff --git a/repo/fsrepo/migrations/migrations_test.go b/repo/fsrepo/migrations/migrations_test.go index 4fb757747..5f029e6a1 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/kubo/config" ) func TestFindMigrations(t *testing.T) { diff --git a/repo/fsrepo/misc.go b/repo/fsrepo/misc.go index 71b640331..7824f2f4f 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/kubo/config" homedir "github.com/mitchellh/go-homedir" ) diff --git a/repo/mock.go b/repo/mock.go index 15313ab37..f33f64a2c 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/kubo/config" ma "github.com/multiformats/go-multiaddr" ) diff --git a/repo/repo.go b/repo/repo.go index 00735eb94..c301fb393 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/kubo/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 326e60bc9..a089410ef 100644 --- a/test/bench/bench_cli_ipfs_add/main.go +++ b/test/bench/bench_cli_ipfs_add/main.go @@ -9,9 +9,9 @@ import ( "path" "testing" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/kubo/thirdparty/unit" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" random "github.com/jbenet/go-random" ) diff --git a/test/bench/offline_add/main.go b/test/bench/offline_add/main.go index 5e70dabb9..a15ebcffd 100644 --- a/test/bench/offline_add/main.go +++ b/test/bench/offline_add/main.go @@ -8,9 +8,9 @@ import ( "path" "testing" - "github.com/ipfs/go-ipfs/thirdparty/unit" + "github.com/ipfs/kubo/thirdparty/unit" - config "github.com/ipfs/go-ipfs/config" + config "github.com/ipfs/kubo/config" random "github.com/jbenet/go-random" ) diff --git a/test/bin/Rules.mk b/test/bin/Rules.mk index b01ec7dd0..02b0a4e5b 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/kubo/test/dependencies/pollEndpoint +$(d)/pollEndpoint: github.com/ipfs/kubo/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/kubo/test/dependencies/go-sleep +$(d)/go-sleep: github.com/ipfs/kubo/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/kubo/test/dependencies/graphsync-get +$(d)/graphsync-get: github.com/ipfs/kubo/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/kubo/test/dependencies/go-timeout +$(d)/go-timeout: github.com/ipfs/kubo/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/kubo/test/dependencies/iptb +$(d)/iptb: github.com/ipfs/kubo/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/kubo/test/dependencies/ma-pipe-unidir +$(d)/ma-pipe-unidir: github.com/ipfs/kubo/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/kubo/test/dependencies/json-to-junit +$(d)/json-to-junit: github.com/ipfs/kubo/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 b81021b30..b6d472930 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/kubo/test/dependencies go 1.17 diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go index f564ee5ee..819b94813 100644 --- a/test/integration/addcat_test.go +++ b/test/integration/addcat_test.go @@ -12,12 +12,12 @@ 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" logging "github.com/ipfs/go-log" + "github.com/ipfs/kubo/core" + "github.com/ipfs/kubo/core/bootstrap" + "github.com/ipfs/kubo/core/coreapi" + mock "github.com/ipfs/kubo/core/mock" + "github.com/ipfs/kubo/thirdparty/unit" "github.com/jbenet/go-random" "github.com/libp2p/go-libp2p-core/peer" testutil "github.com/libp2p/go-libp2p-testing/net" diff --git a/test/integration/bench_cat_test.go b/test/integration/bench_cat_test.go index 45b3b9f3e..3c363c74d 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/kubo/core" + "github.com/ipfs/kubo/core/bootstrap" + "github.com/ipfs/kubo/core/coreapi" + mock "github.com/ipfs/kubo/core/mock" + "github.com/ipfs/kubo/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 bc5a22ea9..b702bae03 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/kubo/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 9caa78c38..fa4e8d513 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/kubo/core" + coremock "github.com/ipfs/kubo/core/mock" + "github.com/ipfs/kubo/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 009d1af32..f8498eea6 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/kubo/core/bootstrap" + "github.com/ipfs/kubo/core/coreapi" + mock "github.com/ipfs/kubo/core/mock" + "github.com/ipfs/kubo/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 44305e051..059ad22ae 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/kubo/core" + mock "github.com/ipfs/kubo/core/mock" + libp2p2 "github.com/ipfs/kubo/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 87b96249a..2748fb78c 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/kubo/plugin" ) var Plugins = []plugin.Plugin{ diff --git a/tracing/tracing.go b/tracing/tracing.go index 84eabc5e7..6cc666a83 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/kubo" "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 e4476149d..4ddc0485e 100644 --- a/version.go +++ b/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/ipfs/go-ipfs/repo/fsrepo" + "github.com/ipfs/kubo/repo/fsrepo" ) // CurrentCommit is the current git commit, this is set as a ldflag in the Makefile