@cryptotaxi247 / kubo / commits / 82467bc93

refactor: rename to kubo

Marcin Rataj committed May 9, 2022 at 20:17 UTC 82467bc936fe24355c930f7226fce7e41fee591c
196 files changed +554 -538
.circleci/main.yml
+2 -2
@@ -119,11 +119,11 @@ jobs:
119 cp go.sum go.sum.bak
120
121 # make sure the examples run against the current version of go-ipfs
122 - go mod edit -replace github.com/ipfs/go-ipfs=./../../..
122 + go mod edit -replace github.com/ipfs/kubo=./../../..
123 go mod tidy
124
125 # use the internal config package when we test the current version of go-ipfs
126 - sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/go-ipfs/config";' ./main.go
126 + sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/kubo/config";' ./main.go
127
128 go test -v ./...
129
README.md
+66 -51
@@ -1,19 +1,27 @@
1 -# go-ipfs
1 +# kubo
2
3 -![banner](https://ipfs.io/ipfs/bafykbzacecaesuqmivkauix25v6i6xxxsvsrtxknhgb5zak3xxsg2nb4dhs2u/ipfs.go.png)
3 +![kubo](https://user-images.githubusercontent.com/157609/167471494-dee3a355-b551-4fbf-98e0-2eb76e867b48.png)
4
5 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square&cacheSeconds=3600)](https://protocol.ai)
6 [![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4.svg?style=flat-square&cacheSeconds=3600)](https://godoc.org/github.com/ipfs/go-ipfs)
7 [![CircleCI](https://img.shields.io/circleci/build/github/ipfs/go-ipfs?style=flat-square&cacheSeconds=3600)](https://circleci.com/gh/ipfs/go-ipfs)
8
9 +## What is "IPFS Banana"?
10 +
11 +This repo provides "jack of all trades, master of none" implementation of IPFS.
12 +
13 +It should be enough to get you started, if you find it lacking, see [other implementations](https://ipfs.io/#install).
14 +
15 +
16 ## What is IPFS?
17
18 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.
19
20 For more info see: https://docs.ipfs.io/introduction/overview/
21
22 +
23 Before opening an issue, consider using one of the following locations to ensure you are opening your thread in the right place:
16 - - go-ipfs _implementation_ bugs in [this repo](https://github.com/ipfs/go-ipfs/issues).
24 + - kubo (previously named go-ipfs) _implementation_ bugs in [this repo](https://github.com/ipfs/go-ipfs/issues).
25 - Documentation issues in [ipfs/docs issues](https://github.com/ipfs/ipfs-docs/issues).
26 - IPFS _design_ in [ipfs/specs issues](https://github.com/ipfs/specs/issues).
27 - 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
43
44 ## Table of Contents
45
38 -- [Security Issues](#security-issues)
39 -- [Install](#install)
40 - - [System Requirements](#system-requirements)
41 - - [Docker](#docker)
42 - - [Native Linux package managers](#native-linux-package-managers)
43 - - [ArchLinux](#archlinux)
44 - - [Nix](#nix-linux)
45 - - [Solus](#solus)
46 - - [openSUSE](#opensuse)
47 - - [Other package managers](#other-package-managers)
48 - - [Guix](#guix)
49 - - [Snap](#snap)
50 - - [macOS package managers](#macos-package-managers)
51 - - [MacPorts](#macports)
52 - - [Nix](#nix-macos)
53 - - [Homebrew](#homebrew)
54 - - [Windows package managers](#windows-package-managers)
55 - - [Chocolatey](#chocolatey)
56 - - [Scoop](#scoop)
57 - - [Install prebuilt binaries](#install-prebuilt-binaries)
58 - - [Build from Source](#build-from-source)
59 - - [Install Go](#install-go)
60 - - [Download and Compile IPFS](#download-and-compile-ipfs)
61 - - [Cross Compiling](#cross-compiling)
62 - - [OpenSSL](#openssl)
63 - - [Troubleshooting](#troubleshooting)
64 - - [Updating go-ipfs](#updating-go-ipfs)
65 - - [Using ipfs-update](#using-ipfs-update)
66 - - [Downloading IPFS builds using IPFS](#downloading-ipfs-builds-using-ipfs)
67 -- [Getting Started](#getting-started)
68 - - [Usage](#usage)
69 - - [Some things to try](#some-things-to-try)
70 - - [Troubleshooting](#troubleshooting-1)
71 -- [Packages](#packages)
72 -- [Development](#development)
73 - - [Map of go-ipfs Subsystems](#map-of-go-ipfs-subsystems)
74 - - [CLI, HTTP-API, Architecture Diagram](#cli-http-api-architecture-diagram)
75 - - [Testing](#testing)
76 - - [Development Dependencies](#development-dependencies)
77 - - [Developer Notes](#developer-notes)
78 -- [Contributing](#contributing)
79 -- [License](#license)
46 +- [kubo](#kubo)
47 + - [What is "IPFS Banana"?](#what-is-ipfs-banana)
48 + - [What is IPFS?](#what-is-ipfs)
49 + - [Next milestones](#next-milestones)
50 + - [Table of Contents](#table-of-contents)
51 + - [Security Issues](#security-issues)
52 + - [Install](#install)
53 + - [System Requirements](#system-requirements)
54 + - [Docker](#docker)
55 + - [Native Linux package managers](#native-linux-package-managers)
56 + - [ArchLinux](#archlinux)
57 + - [Nix](#nix)
58 + - [Solus](#solus)
59 + - [openSUSE](#opensuse)
60 + - [Other package managers](#other-package-managers)
61 + - [Guix](#guix)
62 + - [Snap](#snap)
63 + - [macOS package managers](#macos-package-managers)
64 + - [MacPorts](#macports)
65 + - [Nix](#nix-1)
66 + - [Homebrew](#homebrew)
67 + - [Windows package managers](#windows-package-managers)
68 + - [Chocolatey](#chocolatey)
69 + - [Scoop](#scoop)
70 + - [Install prebuilt binaries](#install-prebuilt-binaries)
71 + - [Build from Source](#build-from-source)
72 + - [Install Go](#install-go)
73 + - [Download and Compile IPFS](#download-and-compile-ipfs)
74 + - [Cross Compiling](#cross-compiling)
75 + - [OpenSSL](#openssl)
76 + - [Troubleshooting](#troubleshooting)
77 + - [Updating](#updating)
78 + - [Using ipfs-update](#using-ipfs-update)
79 + - [Downloading builds using IPFS](#downloading-builds-using-ipfs)
80 + - [Getting Started](#getting-started)
81 + - [Usage](#usage)
82 + - [Some things to try](#some-things-to-try)
83 + - [Troubleshooting](#troubleshooting-1)
84 + - [Packages](#packages)
85 + - [Development](#development)
86 + - [Map of Implemented Subsystems](#map-of-implemented-subsystems)
87 + - [CLI, HTTP-API, Architecture Diagram](#cli-http-api-architecture-diagram)
88 + - [Testing](#testing)
89 + - [Development Dependencies](#development-dependencies)
90 + - [Developer Notes](#developer-notes)
91 + - [Contributing](#contributing)
92 + - [License](#license)
93
94 ## Security Issues
95
@@ -310,7 +323,7 @@ dependencies as well.
323 - 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.
324 - 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.
325
313 -### Updating go-ipfs
326 +### Updating
327
328 #### Using ipfs-update
329
@@ -318,9 +331,11 @@ IPFS has an updating tool that can be accessed through `ipfs update`. The tool i
331 not installed alongside IPFS in order to keep that logic independent of the main
332 codebase. To install `ipfs update`, [download it here](https://ipfs.io/ipns/dist.ipfs.io/#ipfs-update).
333
321 -#### Downloading IPFS builds using IPFS
334 +#### Downloading builds using IPFS
335 +
336 +<!-- TODO: rename this section after we figure out if dist.ipfs.io sgould produce both /go-ipfs/ and /kubo/ -->
337
323 -List the available versions of go-ipfs:
338 +List the available versions of "go-ipfs" implementation:
339
340 ```
341 $ ipfs cat /ipns/dist.ipfs.io/go-ipfs/versions
@@ -454,8 +469,8 @@ Some places to get you started on the codebase:
469 - PubSub: https://github.com/libp2p/go-libp2p-pubsub
470 - [IPFS : The `Add` command demystified](https://github.com/ipfs/go-ipfs/tree/master/docs/add-code-flow.md)
471
457 -### Map of go-ipfs Subsystems
458 -**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!
472 +### Map of Implemented Subsystems
473 +**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!
474 <img src="https://docs.google.com/drawings/d/e/2PACX-1vS_n1FvSu6mdmSirkBrIIEib2gqhgtatD9awaP2_WdrGN4zTNeg620XQd9P95WT-IvognSxIIdCM5uE/pub?w=1446&amp;h=1036">
475
476 ### CLI, HTTP-API, Architecture Diagram
@@ -492,7 +507,7 @@ Please reach out to us in one [chat](https://docs.ipfs.io/community/chat/) rooms
507
508 ## License
509
495 -The go-ipfs project is dual-licensed under Apache 2.0 and MIT terms:
510 +This project is dual-licensed under Apache 2.0 and MIT terms:
511
512 - 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)
513 - MIT license ([LICENSE-MIT](https://github.com/ipfs/go-ipfs/blob/master/LICENSE-MIT) or http://opensource.org/licenses/MIT)
assets/assets.go
+2 -2
@@ -9,8 +9,8 @@ import (
9 gopath "path"
10 "strconv"
11
12 - "github.com/ipfs/go-ipfs/core"
13 - "github.com/ipfs/go-ipfs/core/coreapi"
12 + "github.com/ipfs/kubo/core"
13 + "github.com/ipfs/kubo/core/coreapi"
14
15 "github.com/cespare/xxhash"
16 cid "github.com/ipfs/go-cid"
cmd/ipfs/Rules.mk
+2 -2
@@ -13,7 +13,7 @@ PATH := $(realpath $(d)):$(PATH)
13 # DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go
14 # DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go
15
16 -$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs".CurrentCommit=$(git-hash)"
16 +$(d)_flags =-ldflags="-X "github.com/ipfs/kubo".CurrentCommit=$(git-hash)"
17
18 $(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags)
19
@@ -42,7 +42,7 @@ CLEAN += $(COVER_BIN_$(d))
42
43 $(COVER_BIN_$(d)): GOTAGS += testrunmain
44 $(COVER_BIN_$(d)): $(d) $$(DEPS_GO) ALWAYS
45 - $(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,$<))
45 + $(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,$<))
46 $(eval TMP_LIST := $(call join-with,$(comma),$(TMP_PKGS)))
47 @echo $(GOCC) test $@ -c -covermode atomic -coverpkg ... $(go-flags-with-tags) ./$(@D) # for info
48 @$(GOCC) test -o $@ -c -covermode atomic -coverpkg $(TMP_LIST) $(go-flags-with-tags) ./$(@D) 2>&1 | (grep -v 'warning: no packages being tested' || true)
cmd/ipfs/add_migrations.go
+5 -5
@@ -9,13 +9,13 @@ import (
9 "path/filepath"
10
11 files "github.com/ipfs/go-ipfs-files"
12 - "github.com/ipfs/go-ipfs/core"
13 - "github.com/ipfs/go-ipfs/core/coreapi"
14 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
15 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher"
12 coreiface "github.com/ipfs/interface-go-ipfs-core"
13 "github.com/ipfs/interface-go-ipfs-core/options"
14 ipath "github.com/ipfs/interface-go-ipfs-core/path"
15 + "github.com/ipfs/kubo/core"
16 + "github.com/ipfs/kubo/core/coreapi"
17 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
18 + "github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
19 "github.com/libp2p/go-libp2p-core/peer"
20 )
21
@@ -36,7 +36,7 @@ func addMigrations(ctx context.Context, node *core.IpfsNode, fetcher migrations.
36 if err != nil {
37 return err
38 }
39 - case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/go-ipfs/issues/8780
39 + case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/kubo/issues/8780
40 // Add the downloaded migration files directly
41 if migrations.DownloadDirectory != "" {
42 var paths []string
cmd/ipfs/daemon.go
+16 -16
@@ -15,21 +15,21 @@ import (
15
16 multierror "github.com/hashicorp/go-multierror"
17
18 - version "github.com/ipfs/go-ipfs"
19 - utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util"
20 - oldcmds "github.com/ipfs/go-ipfs/commands"
21 - config "github.com/ipfs/go-ipfs/config"
22 - cserial "github.com/ipfs/go-ipfs/config/serialize"
23 - "github.com/ipfs/go-ipfs/core"
24 - commands "github.com/ipfs/go-ipfs/core/commands"
25 - "github.com/ipfs/go-ipfs/core/coreapi"
26 - corehttp "github.com/ipfs/go-ipfs/core/corehttp"
27 - corerepo "github.com/ipfs/go-ipfs/core/corerepo"
28 - libp2p "github.com/ipfs/go-ipfs/core/node/libp2p"
29 - nodeMount "github.com/ipfs/go-ipfs/fuse/node"
30 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
31 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
32 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher"
18 + version "github.com/ipfs/kubo"
19 + utilmain "github.com/ipfs/kubo/cmd/ipfs/util"
20 + oldcmds "github.com/ipfs/kubo/commands"
21 + config "github.com/ipfs/kubo/config"
22 + cserial "github.com/ipfs/kubo/config/serialize"
23 + "github.com/ipfs/kubo/core"
24 + commands "github.com/ipfs/kubo/core/commands"
25 + "github.com/ipfs/kubo/core/coreapi"
26 + corehttp "github.com/ipfs/kubo/core/corehttp"
27 + corerepo "github.com/ipfs/kubo/core/corerepo"
28 + libp2p "github.com/ipfs/kubo/core/node/libp2p"
29 + nodeMount "github.com/ipfs/kubo/fuse/node"
30 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
31 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
32 + "github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
33 sockets "github.com/libp2p/go-socket-activation"
34
35 cmds "github.com/ipfs/go-ipfs-cmds"
@@ -801,7 +801,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, e
801 }
802
803 if len(cfg.Gateway.PathPrefixes) > 0 {
804 - 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")
804 + 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")
805 }
806
807 node, err := cctx.ConstructNode()
cmd/ipfs/debug.go
+1 -1
@@ -3,7 +3,7 @@ package main
3 import (
4 "net/http"
5
6 - "github.com/ipfs/go-ipfs/profile"
6 + "github.com/ipfs/kubo/profile"
7 )
8
9 func init() {
cmd/ipfs/init.go
+6 -6
@@ -10,18 +10,18 @@ import (
10 "path/filepath"
11 "strings"
12
13 - assets "github.com/ipfs/go-ipfs/assets"
14 - oldcmds "github.com/ipfs/go-ipfs/commands"
15 - core "github.com/ipfs/go-ipfs/core"
16 - "github.com/ipfs/go-ipfs/core/commands"
17 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
13 path "github.com/ipfs/go-path"
14 unixfs "github.com/ipfs/go-unixfs"
15 + assets "github.com/ipfs/kubo/assets"
16 + oldcmds "github.com/ipfs/kubo/commands"
17 + core "github.com/ipfs/kubo/core"
18 + "github.com/ipfs/kubo/core/commands"
19 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
20
21 cmds "github.com/ipfs/go-ipfs-cmds"
22 files "github.com/ipfs/go-ipfs-files"
23 - config "github.com/ipfs/go-ipfs/config"
23 options "github.com/ipfs/interface-go-ipfs-core/options"
24 + config "github.com/ipfs/kubo/config"
25 )
26
27 const (
cmd/ipfs/ipfs.go
+1 -1
@@ -1,7 +1,7 @@
1 package main
2
3 import (
4 - commands "github.com/ipfs/go-ipfs/core/commands"
4 + commands "github.com/ipfs/kubo/core/commands"
5
6 cmds "github.com/ipfs/go-ipfs-cmds"
7 )
cmd/ipfs/main.go
+9 -9
@@ -12,15 +12,15 @@ import (
12 "runtime/pprof"
13 "time"
14
15 - util "github.com/ipfs/go-ipfs/cmd/ipfs/util"
16 - oldcmds "github.com/ipfs/go-ipfs/commands"
17 - core "github.com/ipfs/go-ipfs/core"
18 - corecmds "github.com/ipfs/go-ipfs/core/commands"
19 - corehttp "github.com/ipfs/go-ipfs/core/corehttp"
20 - loader "github.com/ipfs/go-ipfs/plugin/loader"
21 - repo "github.com/ipfs/go-ipfs/repo"
22 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
23 - "github.com/ipfs/go-ipfs/tracing"
15 + util "github.com/ipfs/kubo/cmd/ipfs/util"
16 + oldcmds "github.com/ipfs/kubo/commands"
17 + core "github.com/ipfs/kubo/core"
18 + corecmds "github.com/ipfs/kubo/core/commands"
19 + corehttp "github.com/ipfs/kubo/core/corehttp"
20 + loader "github.com/ipfs/kubo/plugin/loader"
21 + repo "github.com/ipfs/kubo/repo"
22 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
23 + "github.com/ipfs/kubo/tracing"
24 "go.opentelemetry.io/otel"
25
26 cmds "github.com/ipfs/go-ipfs-cmds"
cmd/ipfs/pinmfs.go
+2 -2
@@ -13,8 +13,8 @@ import (
13 logging "github.com/ipfs/go-log"
14 pinclient "github.com/ipfs/go-pinning-service-http-client"
15
16 - config "github.com/ipfs/go-ipfs/config"
17 - "github.com/ipfs/go-ipfs/core"
16 + config "github.com/ipfs/kubo/config"
17 + "github.com/ipfs/kubo/core"
18 )
19
20 // mfslog is the logger for remote mfs pinning
cmd/ipfs/pinmfs_test.go
+1 -1
@@ -7,9 +7,9 @@ import (
7 "testing"
8 "time"
9
10 - config "github.com/ipfs/go-ipfs/config"
10 ipld "github.com/ipfs/go-ipld-format"
11 merkledag "github.com/ipfs/go-merkledag"
12 + config "github.com/ipfs/kubo/config"
13 "github.com/libp2p/go-libp2p-core/host"
14 peer "github.com/libp2p/go-libp2p-core/peer"
15 )
cmd/ipfswatch/ipfswatch_test.go
+1 -1
@@ -6,7 +6,7 @@ package main
6 import (
7 "testing"
8
9 - "github.com/ipfs/go-ipfs/thirdparty/assert"
9 + "github.com/ipfs/kubo/thirdparty/assert"
10 )
11
12 func TestIsHidden(t *testing.T) {
cmd/ipfswatch/main.go
+5 -5
@@ -12,11 +12,11 @@ import (
12 "path/filepath"
13 "syscall"
14
15 - commands "github.com/ipfs/go-ipfs/commands"
16 - core "github.com/ipfs/go-ipfs/core"
17 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
18 - corehttp "github.com/ipfs/go-ipfs/core/corehttp"
19 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
15 + commands "github.com/ipfs/kubo/commands"
16 + core "github.com/ipfs/kubo/core"
17 + coreapi "github.com/ipfs/kubo/core/coreapi"
18 + corehttp "github.com/ipfs/kubo/core/corehttp"
19 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
20
21 fsnotify "github.com/fsnotify/fsnotify"
22 files "github.com/ipfs/go-ipfs-files"
commands/context.go
+4 -4
@@ -6,15 +6,15 @@ import (
6 "strings"
7 "time"
8
9 - core "github.com/ipfs/go-ipfs/core"
10 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
11 - loader "github.com/ipfs/go-ipfs/plugin/loader"
9 + core "github.com/ipfs/kubo/core"
10 + coreapi "github.com/ipfs/kubo/core/coreapi"
11 + loader "github.com/ipfs/kubo/plugin/loader"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 - config "github.com/ipfs/go-ipfs/config"
14 logging "github.com/ipfs/go-log"
15 coreiface "github.com/ipfs/interface-go-ipfs-core"
16 options "github.com/ipfs/interface-go-ipfs-core/options"
17 + config "github.com/ipfs/kubo/config"
18 )
19
20 var log = logging.Logger("command")
config/experiments.go
+1 -1
@@ -3,7 +3,7 @@ package config
3 type Experiments struct {
4 FilestoreEnabled bool
5 UrlstoreEnabled bool
6 - ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/go-ipfs/pull/8527
6 + ShardingEnabled bool `json:",omitempty"` // deprecated by autosharding: https://github.com/ipfs/kubo/pull/8527
7 GraphsyncEnabled bool
8 Libp2pStreamMounting bool
9 P2pHttpProxy bool
config/gateway.go
+1 -1
@@ -61,7 +61,7 @@ type Gateway struct {
61 // Setting to 0 will enable fast listings for all directories.
62 FastDirIndexThreshold *OptionalInteger `json:",omitempty"`
63
64 - // FIXME: Not yet implemented: https://github.com/ipfs/go-ipfs/issues/8059
64 + // FIXME: Not yet implemented: https://github.com/ipfs/kubo/issues/8059
65 APICommands []string
66
67 // NoFetch configures the gateway to _not_ fetch blocks in response to
config/serialize/serialize.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "os"
9 "path/filepath"
10
11 - "github.com/ipfs/go-ipfs/config"
11 + "github.com/ipfs/kubo/config"
12
13 "github.com/facebookgo/atomicfile"
14 )
config/serialize/serialize_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "runtime"
6 "testing"
7
8 - config "github.com/ipfs/go-ipfs/config"
8 + config "github.com/ipfs/kubo/config"
9 )
10
11 func TestConfig(t *testing.T) {
core/builder.go
+2 -2
@@ -7,8 +7,8 @@ import (
7 "sync"
8 "time"
9
10 - "github.com/ipfs/go-ipfs/core/bootstrap"
11 - "github.com/ipfs/go-ipfs/core/node"
10 + "github.com/ipfs/kubo/core/bootstrap"
11 + "github.com/ipfs/kubo/core/node"
12
13 "github.com/ipfs/go-metrics-interface"
14 "go.uber.org/dig"
core/commands/active.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "text/tabwriter"
8 "time"
9
10 - oldcmds "github.com/ipfs/go-ipfs/commands"
10 + oldcmds "github.com/ipfs/kubo/commands"
11
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 )
core/commands/add.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "path"
9 "strings"
10
11 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 "github.com/cheggaaa/pb"
14 cmds "github.com/ipfs/go-ipfs-cmds"
core/commands/bitswap.go
+2 -2
@@ -4,8 +4,8 @@ import (
4 "fmt"
5 "io"
6
7 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
8 - e "github.com/ipfs/go-ipfs/core/commands/e"
7 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
8 + e "github.com/ipfs/kubo/core/commands/e"
9
10 humanize "github.com/dustin/go-humanize"
11 bitswap "github.com/ipfs/go-bitswap"
core/commands/block.go
+2 -2
@@ -8,8 +8,8 @@ import (
8
9 files "github.com/ipfs/go-ipfs-files"
10
11 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12 - "github.com/ipfs/go-ipfs/core/commands/cmdutils"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12 + "github.com/ipfs/kubo/core/commands/cmdutils"
13
14 cmds "github.com/ipfs/go-ipfs-cmds"
15 options "github.com/ipfs/interface-go-ipfs-core/options"
core/commands/bootstrap.go
+4 -4
@@ -6,12 +6,12 @@ import (
6 "io"
7 "sort"
8
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 - repo "github.com/ipfs/go-ipfs/repo"
11 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10 + repo "github.com/ipfs/kubo/repo"
11 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 - config "github.com/ipfs/go-ipfs/config"
14 + config "github.com/ipfs/kubo/config"
15 peer "github.com/libp2p/go-libp2p-core/peer"
16 ma "github.com/multiformats/go-multiaddr"
17 )
core/commands/cat.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "io"
7 "os"
8
9 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 "github.com/cheggaaa/pb"
12 "github.com/ipfs/go-ipfs-cmds"
core/commands/cmdenv/env.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 "strconv"
6 "strings"
7
8 - "github.com/ipfs/go-ipfs/commands"
9 - "github.com/ipfs/go-ipfs/core"
8 + "github.com/ipfs/kubo/commands"
9 + "github.com/ipfs/kubo/core"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 logging "github.com/ipfs/go-log"
core/commands/cmdutils/utils.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 const (
13 AllowBigBlockOptionName = "allow-big-block"
14 - SoftBlockLimit = 1024 * 1024 // https://github.com/ipfs/go-ipfs/issues/7421#issuecomment-910833499
14 + SoftBlockLimit = 1024 * 1024 // https://github.com/ipfs/kubo/issues/7421#issuecomment-910833499
15 )
16
17 var AllowBigBlockOption cmds.Option
core/commands/commands.go
+1 -1
@@ -1,6 +1,6 @@
1 // Package commands implements the ipfs command interface
2 //
3 -// Using github.com/ipfs/go-ipfs/commands to define the command line and HTTP
3 +// Using github.com/ipfs/kubo/commands to define the command line and HTTP
4 // APIs. This is the interface available to folks using IPFS from outside of
5 // the Go language.
6 package commands
core/commands/config.go
+4 -4
@@ -9,13 +9,13 @@ import (
9 "os/exec"
10 "strings"
11
12 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
13 - "github.com/ipfs/go-ipfs/repo"
14 - "github.com/ipfs/go-ipfs/repo/fsrepo"
12 + "github.com/ipfs/kubo/core/commands/cmdenv"
13 + "github.com/ipfs/kubo/repo"
14 + "github.com/ipfs/kubo/repo/fsrepo"
15
16 "github.com/elgris/jsondiff"
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 - config "github.com/ipfs/go-ipfs/config"
18 + config "github.com/ipfs/kubo/config"
19 )
20
21 // ConfigUpdateOutput is config profile apply command's output
core/commands/dag/dag.go
+2 -2
@@ -4,8 +4,8 @@ import (
4 "fmt"
5 "io"
6
7 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
8 - "github.com/ipfs/go-ipfs/core/commands/cmdutils"
7 + "github.com/ipfs/kubo/core/commands/cmdenv"
8 + "github.com/ipfs/kubo/core/commands/cmdutils"
9
10 cid "github.com/ipfs/go-cid"
11 cidenc "github.com/ipfs/go-cidutil/cidenc"
core/commands/dag/export.go
+1 -1
@@ -11,9 +11,9 @@ import (
11 "github.com/cheggaaa/pb"
12 blocks "github.com/ipfs/go-block-format"
13 cid "github.com/ipfs/go-cid"
14 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
14 ipld "github.com/ipfs/go-ipld-format"
15 iface "github.com/ipfs/interface-go-ipfs-core"
16 + "github.com/ipfs/kubo/core/commands/cmdenv"
17
18 cmds "github.com/ipfs/go-ipfs-cmds"
19 gocar "github.com/ipld/go-car"
core/commands/dag/get.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "fmt"
5 "io"
6
7 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
7 ipldlegacy "github.com/ipfs/go-ipld-legacy"
8 "github.com/ipfs/interface-go-ipfs-core/path"
9 + "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 "github.com/ipld/go-ipld-prime"
12 "github.com/ipld/go-ipld-prime/multicodec"
core/commands/dag/import.go
+2 -2
@@ -7,11 +7,11 @@ import (
7
8 cid "github.com/ipfs/go-cid"
9 files "github.com/ipfs/go-ipfs-files"
10 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 - "github.com/ipfs/go-ipfs/core/commands/cmdutils"
10 ipld "github.com/ipfs/go-ipld-format"
11 iface "github.com/ipfs/interface-go-ipfs-core"
12 "github.com/ipfs/interface-go-ipfs-core/options"
13 + "github.com/ipfs/kubo/core/commands/cmdenv"
14 + "github.com/ipfs/kubo/core/commands/cmdutils"
15
16 cmds "github.com/ipfs/go-ipfs-cmds"
17 gocarv2 "github.com/ipld/go-car/v2"
core/commands/dag/put.go
+2 -2
@@ -6,9 +6,9 @@ import (
6
7 blocks "github.com/ipfs/go-block-format"
8 "github.com/ipfs/go-cid"
9 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 - "github.com/ipfs/go-ipfs/core/commands/cmdutils"
9 ipldlegacy "github.com/ipfs/go-ipld-legacy"
10 + "github.com/ipfs/kubo/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/cmdutils"
12 "github.com/ipld/go-ipld-prime/multicodec"
13 basicnode "github.com/ipld/go-ipld-prime/node/basic"
14
core/commands/dag/resolve.go
+1 -1
@@ -1,8 +1,8 @@
1 package dagcmd
2
3 import (
4 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
4 "github.com/ipfs/interface-go-ipfs-core/path"
5 + "github.com/ipfs/kubo/core/commands/cmdenv"
6
7 cmds "github.com/ipfs/go-ipfs-cmds"
8 )
core/commands/dag/stat.go
+2 -2
@@ -5,10 +5,10 @@ import (
5 "io"
6 "os"
7
8 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 - "github.com/ipfs/go-ipfs/core/commands/e"
8 "github.com/ipfs/go-merkledag/traverse"
9 "github.com/ipfs/interface-go-ipfs-core/path"
10 + "github.com/ipfs/kubo/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/e"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 mdag "github.com/ipfs/go-merkledag"
core/commands/dht.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "io"
9 "time"
10
11 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 cid "github.com/ipfs/go-cid"
14 cmds "github.com/ipfs/go-ipfs-cmds"
core/commands/dns.go
+3 -3
@@ -4,10 +4,10 @@ import (
4 "fmt"
5 "io"
6
7 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
8 - ncmd "github.com/ipfs/go-ipfs/core/commands/name"
7 namesys "github.com/ipfs/go-namesys"
8 nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10 + ncmd "github.com/ipfs/kubo/core/commands/name"
11
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 )
@@ -17,7 +17,7 @@ const (
17 )
18
19 var DNSCmd = &cmds.Command{
20 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/8607
20 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/8607
21 Helptext: cmds.HelpText{
22 Tagline: "Resolve DNSLink records.",
23 ShortDescription: `
core/commands/files.go
+2 -2
@@ -11,8 +11,8 @@ import (
11 "strings"
12
13 humanize "github.com/dustin/go-humanize"
14 - "github.com/ipfs/go-ipfs/core"
15 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
14 + "github.com/ipfs/kubo/core"
15 + "github.com/ipfs/kubo/core/commands/cmdenv"
16
17 bservice "github.com/ipfs/go-blockservice"
18 cid "github.com/ipfs/go-cid"
core/commands/filestore.go
+3 -3
@@ -8,9 +8,9 @@ import (
8
9 filestore "github.com/ipfs/go-filestore"
10 cmds "github.com/ipfs/go-ipfs-cmds"
11 - core "github.com/ipfs/go-ipfs/core"
12 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
13 - e "github.com/ipfs/go-ipfs/core/commands/e"
11 + core "github.com/ipfs/kubo/core"
12 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
13 + e "github.com/ipfs/kubo/core/commands/e"
14
15 "github.com/ipfs/go-cid"
16 )
core/commands/get.go
+2 -2
@@ -11,8 +11,8 @@ import (
11 "path/filepath"
12 "strings"
13
14 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
15 - "github.com/ipfs/go-ipfs/core/commands/e"
14 + "github.com/ipfs/kubo/core/commands/cmdenv"
15 + "github.com/ipfs/kubo/core/commands/e"
16
17 "github.com/cheggaaa/pb"
18 cmds "github.com/ipfs/go-ipfs-cmds"
core/commands/id.go
+4 -4
@@ -9,12 +9,12 @@ import (
9 "sort"
10 "strings"
11
12 - version "github.com/ipfs/go-ipfs"
13 - core "github.com/ipfs/go-ipfs/core"
14 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12 + version "github.com/ipfs/kubo"
13 + core "github.com/ipfs/kubo/core"
14 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
15
16 cmds "github.com/ipfs/go-ipfs-cmds"
17 - ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
17 + ke "github.com/ipfs/kubo/core/commands/keyencode"
18 ic "github.com/libp2p/go-libp2p-core/crypto"
19 "github.com/libp2p/go-libp2p-core/host"
20 peer "github.com/libp2p/go-libp2p-core/peer"
core/commands/keystore.go
+7 -7
@@ -14,14 +14,14 @@ import (
14
15 cmds "github.com/ipfs/go-ipfs-cmds"
16 keystore "github.com/ipfs/go-ipfs-keystore"
17 - oldcmds "github.com/ipfs/go-ipfs/commands"
18 - config "github.com/ipfs/go-ipfs/config"
19 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
20 - "github.com/ipfs/go-ipfs/core/commands/e"
21 - ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
22 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
23 - migrations "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
17 options "github.com/ipfs/interface-go-ipfs-core/options"
18 + oldcmds "github.com/ipfs/kubo/commands"
19 + config "github.com/ipfs/kubo/config"
20 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
21 + "github.com/ipfs/kubo/core/commands/e"
22 + ke "github.com/ipfs/kubo/core/commands/keyencode"
23 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
24 + migrations "github.com/ipfs/kubo/repo/fsrepo/migrations"
25 "github.com/libp2p/go-libp2p-core/crypto"
26 peer "github.com/libp2p/go-libp2p-core/peer"
27 )
core/commands/ls.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "sort"
8 "text/tabwriter"
9
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 unixfs "github.com/ipfs/go-unixfs"
core/commands/mount_unix.go
+4 -4
@@ -7,12 +7,12 @@ import (
7 "fmt"
8 "io"
9
10 - oldcmds "github.com/ipfs/go-ipfs/commands"
11 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12 - nodeMount "github.com/ipfs/go-ipfs/fuse/node"
10 + oldcmds "github.com/ipfs/kubo/commands"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12 + nodeMount "github.com/ipfs/kubo/fuse/node"
13
14 cmds "github.com/ipfs/go-ipfs-cmds"
15 - config "github.com/ipfs/go-ipfs/config"
15 + config "github.com/ipfs/kubo/config"
16 )
17
18 const (
core/commands/multibase.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "strings"
8
9 cmds "github.com/ipfs/go-ipfs-cmds"
10 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 + "github.com/ipfs/kubo/core/commands/cmdenv"
11 mbase "github.com/multiformats/go-multibase"
12 )
13
core/commands/name/ipns.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "strings"
8 "time"
9
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 namesys "github.com/ipfs/go-namesys"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 logging "github.com/ipfs/go-log"
core/commands/name/ipnsps.go
+2 -2
@@ -6,8 +6,8 @@ import (
6 "strings"
7
8 cmds "github.com/ipfs/go-ipfs-cmds"
9 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 - ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
9 + "github.com/ipfs/kubo/core/commands/cmdenv"
10 + ke "github.com/ipfs/kubo/core/commands/keyencode"
11 "github.com/libp2p/go-libp2p-core/peer"
12 record "github.com/libp2p/go-libp2p-record"
13 )
core/commands/name/publish.go
+2 -2
@@ -6,13 +6,13 @@ import (
6 "io"
7 "time"
8
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 - ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
12 iface "github.com/ipfs/interface-go-ipfs-core"
13 options "github.com/ipfs/interface-go-ipfs-core/options"
14 path "github.com/ipfs/interface-go-ipfs-core/path"
15 + ke "github.com/ipfs/kubo/core/commands/keyencode"
16 peer "github.com/libp2p/go-libp2p-core/peer"
17 )
18
core/commands/object/diff.go
+2 -2
@@ -8,7 +8,7 @@ import (
8 "github.com/ipfs/go-merkledag/dagutils"
9 path "github.com/ipfs/interface-go-ipfs-core/path"
10
11 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12 )
13
14 const (
@@ -20,7 +20,7 @@ type Changes struct {
20 }
21
22 var ObjectDiffCmd = &cmds.Command{
23 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
23 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
24 Helptext: cmds.HelpText{
25 Tagline: "Display the diff between two IPFS objects.",
26 ShortDescription: `
core/commands/object/object.go
+8 -8
@@ -8,7 +8,7 @@ import (
8 "text/tabwriter"
9
10 cmds "github.com/ipfs/go-ipfs-cmds"
11 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 humanize "github.com/dustin/go-humanize"
14 "github.com/ipfs/go-cid"
@@ -46,7 +46,7 @@ const (
46 )
47
48 var ObjectCmd = &cmds.Command{
49 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
49 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
50 Helptext: cmds.HelpText{
51 Tagline: "Deprecated commands to interact with dag-pb objects. Use 'dag' or 'files' instead.",
52 ShortDescription: `
@@ -68,7 +68,7 @@ directly. Deprecated, use more modern 'ipfs dag' and 'ipfs files' instead.`,
68
69 // ObjectDataCmd object data command
70 var ObjectDataCmd = &cmds.Command{
71 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
71 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
72 Helptext: cmds.HelpText{
73 Tagline: "Deprecated way to read the raw bytes of a dag-pb object: use 'dag get' instead.",
74 ShortDescription: `
@@ -108,7 +108,7 @@ is the raw data of the object.
108
109 // ObjectLinksCmd object links command
110 var ObjectLinksCmd = &cmds.Command{
111 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
111 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
112 Helptext: cmds.HelpText{
113 Tagline: "Deprecated way to output links in the specified dag-pb object: use 'dag get' instead.",
114 ShortDescription: `
@@ -183,7 +183,7 @@ multihash. Provided for legacy reasons. Use 'ipfs dag get' instead.
183
184 // ObjectGetCmd object get command
185 var ObjectGetCmd = &cmds.Command{
186 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
186 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
187 Helptext: cmds.HelpText{
188 Tagline: "Deprecated way to get and serialize the dag-pb node. Use 'dag get' instead",
189 ShortDescription: `
@@ -275,7 +275,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs dag get' instead.
275
276 // ObjectStatCmd object stat command
277 var ObjectStatCmd = &cmds.Command{
278 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
278 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
279 Helptext: cmds.HelpText{
280 Tagline: "Deprecated way to read stats for the dag-pb node. Use 'files stat' instead.",
281 ShortDescription: `
@@ -375,7 +375,7 @@ DEPRECATED: Provided for legacy reasons. Modern replacements:
375
376 // ObjectPutCmd object put command
377 var ObjectPutCmd = &cmds.Command{
378 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
378 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
379 Helptext: cmds.HelpText{
380 Tagline: "Deprecated way to store input as a DAG object. Use 'dag put' instead.",
381 ShortDescription: `
@@ -455,7 +455,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs dag put' instead.
455
456 // ObjectNewCmd object new command
457 var ObjectNewCmd = &cmds.Command{
458 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
458 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
459 Helptext: cmds.HelpText{
460 Tagline: "Deprecated way to create a new dag-pb object from a template.",
461 ShortDescription: `
core/commands/object/patch.go
+7 -7
@@ -5,15 +5,15 @@ import (
5 "io"
6
7 cmds "github.com/ipfs/go-ipfs-cmds"
8 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 - "github.com/ipfs/go-ipfs/core/commands/cmdutils"
8 + "github.com/ipfs/kubo/core/commands/cmdenv"
9 + "github.com/ipfs/kubo/core/commands/cmdutils"
10
11 "github.com/ipfs/interface-go-ipfs-core/options"
12 "github.com/ipfs/interface-go-ipfs-core/path"
13 )
14
15 var ObjectPatchCmd = &cmds.Command{
16 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
16 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
17 Helptext: cmds.HelpText{
18 Tagline: "Deprecated way to create a new merkledag object based on an existing one. Use MFS with 'files cp|rm' instead.",
19 ShortDescription: `
@@ -49,7 +49,7 @@ For modern use cases, use MFS with 'files' commands: 'ipfs files --help'.
49 }
50
51 var patchAppendDataCmd = &cmds.Command{
52 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
52 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
53 Helptext: cmds.HelpText{
54 Tagline: "Deprecated way to append data to the data segment of a DAG node.",
55 ShortDescription: `
@@ -104,7 +104,7 @@ DEPRECATED and provided for legacy reasons. Use 'ipfs add' or 'ipfs files' inste
104 }
105
106 var patchSetDataCmd = &cmds.Command{
107 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
107 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
108 Helptext: cmds.HelpText{
109 Tagline: "Deprecated way to set the data field of dag-pb object.",
110 ShortDescription: `
@@ -155,7 +155,7 @@ DEPRECATED and provided for legacy reasons. Use 'files cp' and 'dag put' instead
155 }
156
157 var patchRmLinkCmd = &cmds.Command{
158 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
158 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
159 Helptext: cmds.HelpText{
160 Tagline: "Deprecated way to remove a link from dag-pb object.",
161 ShortDescription: `
@@ -202,7 +202,7 @@ const (
202 )
203
204 var patchAddLinkCmd = &cmds.Command{
205 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7936
205 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
206 Helptext: cmds.HelpText{
207 Tagline: "Deprecated way to add a link to a given dag-pb.",
208 ShortDescription: `
core/commands/p2p.go
+3 -3
@@ -10,9 +10,9 @@ import (
10 "text/tabwriter"
11 "time"
12
13 - core "github.com/ipfs/go-ipfs/core"
14 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
15 - p2p "github.com/ipfs/go-ipfs/p2p"
13 + core "github.com/ipfs/kubo/core"
14 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
15 + p2p "github.com/ipfs/kubo/p2p"
16
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 peer "github.com/libp2p/go-libp2p-core/peer"
core/commands/pin/pin.go
+3 -3
@@ -19,9 +19,9 @@ import (
19 options "github.com/ipfs/interface-go-ipfs-core/options"
20 "github.com/ipfs/interface-go-ipfs-core/path"
21
22 - core "github.com/ipfs/go-ipfs/core"
23 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
24 - e "github.com/ipfs/go-ipfs/core/commands/e"
22 + core "github.com/ipfs/kubo/core"
23 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
24 + e "github.com/ipfs/kubo/core/commands/e"
25 )
26
27 var PinCmd = &cmds.Command{
core/commands/pin/remotepin.go
+4 -4
@@ -17,12 +17,12 @@ import (
17
18 cid "github.com/ipfs/go-cid"
19 cmds "github.com/ipfs/go-ipfs-cmds"
20 - config "github.com/ipfs/go-ipfs/config"
21 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
22 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
20 logging "github.com/ipfs/go-log"
21 pinclient "github.com/ipfs/go-pinning-service-http-client"
22 path "github.com/ipfs/interface-go-ipfs-core/path"
23 + config "github.com/ipfs/kubo/config"
24 + "github.com/ipfs/kubo/core/commands/cmdenv"
25 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
26 "github.com/libp2p/go-libp2p-core/host"
27 peer "github.com/libp2p/go-libp2p-core/peer"
28 )
@@ -761,7 +761,7 @@ func normalizeEndpoint(endpoint string) (string, error) {
761 return "", fmt.Errorf("service endpoint must be a valid HTTP URL")
762 }
763
764 - // cleanup trailing and duplicate slashes (https://github.com/ipfs/go-ipfs/issues/7826)
764 + // cleanup trailing and duplicate slashes (https://github.com/ipfs/kubo/issues/7826)
765 uri.Path = gopath.Clean(uri.Path)
766 uri.Path = strings.TrimSuffix(uri.Path, ".")
767 uri.Path = strings.TrimSuffix(uri.Path, "/")
core/commands/ping.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "strings"
9 "time"
10
11 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 peer "github.com/libp2p/go-libp2p-core/peer"
core/commands/profile.go
+3 -3
@@ -9,8 +9,8 @@ import (
9 "time"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 - "github.com/ipfs/go-ipfs/core/commands/e"
13 - "github.com/ipfs/go-ipfs/profile"
12 + "github.com/ipfs/kubo/core/commands/e"
13 + "github.com/ipfs/kubo/profile"
14 )
15
16 // 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
41 the running go-ipfs binary.
42
43 Profiles can be examined using 'go tool pprof', some tips can be found at
44 -https://github.com/ipfs/go-ipfs/blob/master/docs/debug-guide.md.
44 +https://github.com/ipfs/kubo/blob/master/docs/debug-guide.md.
45
46 Privacy Notice:
47
core/commands/pubsub.go
+4 -4
@@ -7,7 +7,7 @@ import (
7 "net/http"
8 "sort"
9
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11 mbase "github.com/multiformats/go-multibase"
12 "github.com/pkg/errors"
13
@@ -336,7 +336,7 @@ TOPIC AND DATA ENCODING
336
337 // TODO: move to cmdenv?
338 // Encode binary data to be passed as multibase string in URL arguments.
339 -// (avoiding issues described in https://github.com/ipfs/go-ipfs/issues/7939)
339 +// (avoiding issues described in https://github.com/ipfs/kubo/issues/7939)
340 func urlArgsEncoder(req *cmds.Request, env cmds.Environment) error {
341 encoder, _ := mbase.EncoderByName("base64url")
342 for n, arg := range req.Arguments {
@@ -346,7 +346,7 @@ func urlArgsEncoder(req *cmds.Request, env cmds.Environment) error {
346 }
347
348 // Decode binary data passed as multibase string in URL arguments.
349 -// (avoiding issues described in https://github.com/ipfs/go-ipfs/issues/7939)
349 +// (avoiding issues described in https://github.com/ipfs/kubo/issues/7939)
350 func urlArgsDecoder(req *cmds.Request, env cmds.Environment) error {
351 for n, arg := range req.Arguments {
352 encoding, data, err := mbase.Decode(arg)
@@ -355,7 +355,7 @@ func urlArgsDecoder(req *cmds.Request, env cmds.Environment) error {
355 }
356
357 // Enforce URL-safe encoding is used for data passed via URL arguments
358 - // - without this we get data corruption similar to https://github.com/ipfs/go-ipfs/issues/7939
358 + // - without this we get data corruption similar to https://github.com/ipfs/kubo/issues/7939
359 // - we can't just deny base64, because there may be other bases that
360 // are not URL-safe – better to force base64url which is known to be
361 // safe in URL context
core/commands/refs.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "io"
8 "strings"
9
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11
12 cid "github.com/ipfs/go-cid"
13 cidenc "github.com/ipfs/go-cidutil/cidenc"
core/commands/repo.go
+7 -7
@@ -11,12 +11,12 @@ import (
11 "sync"
12 "text/tabwriter"
13
14 - oldcmds "github.com/ipfs/go-ipfs/commands"
15 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
16 - corerepo "github.com/ipfs/go-ipfs/core/corerepo"
17 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
19 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations/ipfsfetcher"
14 + oldcmds "github.com/ipfs/kubo/commands"
15 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
16 + corerepo "github.com/ipfs/kubo/core/corerepo"
17 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
18 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
19 + "github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
20
21 humanize "github.com/dustin/go-humanize"
22 cid "github.com/ipfs/go-cid"
@@ -227,7 +227,7 @@ Version string The repo version.
227 }
228
229 var repoFsckCmd = &cmds.Command{
230 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/6435
230 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/6435
231 Helptext: cmds.HelpText{
232 Tagline: "Remove repo lockfiles.",
233 ShortDescription: `
core/commands/resolve.go
+2 -2
@@ -7,9 +7,9 @@ import (
7 "strings"
8 "time"
9
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 - ncmd "github.com/ipfs/go-ipfs/core/commands/name"
10 ns "github.com/ipfs/go-namesys"
11 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12 + ncmd "github.com/ipfs/kubo/core/commands/name"
13
14 cidenc "github.com/ipfs/go-cidutil/cidenc"
15 cmds "github.com/ipfs/go-ipfs-cmds"
core/commands/root.go
+6 -6
@@ -3,12 +3,12 @@ package commands
3 import (
4 "errors"
5
6 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
7 - dag "github.com/ipfs/go-ipfs/core/commands/dag"
8 - name "github.com/ipfs/go-ipfs/core/commands/name"
9 - ocmd "github.com/ipfs/go-ipfs/core/commands/object"
10 - "github.com/ipfs/go-ipfs/core/commands/pin"
11 - unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs"
6 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
7 + dag "github.com/ipfs/kubo/core/commands/dag"
8 + name "github.com/ipfs/kubo/core/commands/name"
9 + ocmd "github.com/ipfs/kubo/core/commands/object"
10 + "github.com/ipfs/kubo/core/commands/pin"
11 + unixfs "github.com/ipfs/kubo/core/commands/unixfs"
12
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 logging "github.com/ipfs/go-log"
core/commands/shutdown.go
+1 -1
@@ -2,7 +2,7 @@ package commands
2
3 import (
4 cmds "github.com/ipfs/go-ipfs-cmds"
5 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
5 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
6 )
7
8 var daemonShutdownCmd = &cmds.Command{
core/commands/stat.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "os"
7 "time"
8
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 humanize "github.com/dustin/go-humanize"
12 cmds "github.com/ipfs/go-ipfs-cmds"
core/commands/stat_dht.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "text/tabwriter"
7 "time"
8
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 "github.com/libp2p/go-libp2p-core/network"
core/commands/stat_provide.go
+1 -1
@@ -8,7 +8,7 @@ import (
8
9 humanize "github.com/dustin/go-humanize"
10 cmds "github.com/ipfs/go-ipfs-cmds"
11 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11 + "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 "github.com/ipfs/go-ipfs-provider/batched"
14 )
core/commands/swarm.go
+6 -6
@@ -13,12 +13,12 @@ import (
13 "time"
14
15 files "github.com/ipfs/go-ipfs-files"
16 - "github.com/ipfs/go-ipfs/commands"
17 - "github.com/ipfs/go-ipfs/config"
18 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
19 - "github.com/ipfs/go-ipfs/core/node/libp2p"
20 - "github.com/ipfs/go-ipfs/repo"
21 - "github.com/ipfs/go-ipfs/repo/fsrepo"
16 + "github.com/ipfs/kubo/commands"
17 + "github.com/ipfs/kubo/config"
18 + "github.com/ipfs/kubo/core/commands/cmdenv"
19 + "github.com/ipfs/kubo/core/node/libp2p"
20 + "github.com/ipfs/kubo/repo"
21 + "github.com/ipfs/kubo/repo/fsrepo"
22
23 cmds "github.com/ipfs/go-ipfs-cmds"
24 inet "github.com/libp2p/go-libp2p-core/network"
core/commands/sysdiag.go
+3 -3
@@ -5,9 +5,9 @@ import (
5 "path"
6 "runtime"
7
8 - version "github.com/ipfs/go-ipfs"
9 - "github.com/ipfs/go-ipfs/core"
10 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
8 + version "github.com/ipfs/kubo"
9 + "github.com/ipfs/kubo/core"
10 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 manet "github.com/multiformats/go-multiaddr/net"
core/commands/tar.go
+5 -5
@@ -5,15 +5,15 @@ import (
5 "io"
6
7 cmds "github.com/ipfs/go-ipfs-cmds"
8 - "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 - tar "github.com/ipfs/go-ipfs/tar"
8 + "github.com/ipfs/kubo/core/commands/cmdenv"
9 + tar "github.com/ipfs/kubo/tar"
10
11 dag "github.com/ipfs/go-merkledag"
12 path "github.com/ipfs/interface-go-ipfs-core/path"
13 )
14
15 var TarCmd = &cmds.Command{
16 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951
16 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7951
17 Helptext: cmds.HelpText{
18 Tagline: "Utility functions for tar files in ipfs.",
19 },
@@ -25,7 +25,7 @@ var TarCmd = &cmds.Command{
25 }
26
27 var tarAddCmd = &cmds.Command{
28 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951
28 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7951
29 Helptext: cmds.HelpText{
30 Tagline: "Import a tar file into IPFS.",
31 ShortDescription: `
@@ -76,7 +76,7 @@ represent it.
76 }
77
78 var tarCatCmd = &cmds.Command{
79 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/issues/7951
79 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7951
80 Helptext: cmds.HelpText{
81 Tagline: "Export a tar file from IPFS.",
82 ShortDescription: `
core/commands/unixfs/ls.go
+2 -2
@@ -6,7 +6,7 @@ import (
6 "sort"
7 "text/tabwriter"
8
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 merkledag "github.com/ipfs/go-merkledag"
@@ -33,7 +33,7 @@ type LsOutput struct {
33 }
34
35 var LsCmd = &cmds.Command{
36 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/pull/7755
36 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/pull/7755
37 Helptext: cmds.HelpText{
38 Tagline: "List directory contents for Unix filesystem objects. Deprecated: Use 'ipfs ls' and 'ipfs files ls' instead.",
39 ShortDescription: `
core/commands/unixfs/unixfs.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 )
6
7 var UnixFSCmd = &cmds.Command{
8 - Status: cmds.Deprecated, // https://github.com/ipfs/go-ipfs/pull/7755
8 + Status: cmds.Deprecated, // https://github.com/ipfs/kubo/pull/7755
9 Helptext: cmds.HelpText{
10 Tagline: "Interact with IPFS objects representing Unix filesystems.",
11 ShortDescription: `
core/commands/urlstore.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "net/url"
7
8 filestore "github.com/ipfs/go-filestore"
9 - cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9 + cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 files "github.com/ipfs/go-ipfs-files"
core/commands/version.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "io"
7 "runtime/debug"
8
9 - version "github.com/ipfs/go-ipfs"
9 + version "github.com/ipfs/kubo"
10
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 )
core/core.go
+7 -7
@@ -43,15 +43,15 @@ import (
43 ma "github.com/multiformats/go-multiaddr"
44 madns "github.com/multiformats/go-multiaddr-dns"
45
46 - "github.com/ipfs/go-ipfs/core/bootstrap"
47 - "github.com/ipfs/go-ipfs/core/node"
48 - "github.com/ipfs/go-ipfs/core/node/libp2p"
49 - "github.com/ipfs/go-ipfs/fuse/mount"
50 - "github.com/ipfs/go-ipfs/p2p"
51 - "github.com/ipfs/go-ipfs/peering"
52 - "github.com/ipfs/go-ipfs/repo"
46 "github.com/ipfs/go-namesys"
47 ipnsrp "github.com/ipfs/go-namesys/republisher"
48 + "github.com/ipfs/kubo/core/bootstrap"
49 + "github.com/ipfs/kubo/core/node"
50 + "github.com/ipfs/kubo/core/node/libp2p"
51 + "github.com/ipfs/kubo/fuse/mount"
52 + "github.com/ipfs/kubo/p2p"
53 + "github.com/ipfs/kubo/peering"
54 + "github.com/ipfs/kubo/repo"
55 )
56
57 var log = logging.Logger("core")
core/core_test.go
+2 -2
@@ -5,11 +5,11 @@ import (
5
6 context "context"
7
8 - "github.com/ipfs/go-ipfs/repo"
8 + "github.com/ipfs/kubo/repo"
9
10 datastore "github.com/ipfs/go-datastore"
11 syncds "github.com/ipfs/go-datastore/sync"
12 - config "github.com/ipfs/go-ipfs/config"
12 + config "github.com/ipfs/kubo/config"
13 )
14
15 func TestInitialization(t *testing.T) {
core/coreapi/block.go
+2 -2
@@ -15,8 +15,8 @@ import (
15 "go.opentelemetry.io/otel/attribute"
16 "go.opentelemetry.io/otel/trace"
17
18 - util "github.com/ipfs/go-ipfs/blocks/blockstoreutil"
19 - "github.com/ipfs/go-ipfs/tracing"
18 + util "github.com/ipfs/kubo/blocks/blockstoreutil"
19 + "github.com/ipfs/kubo/tracing"
20 )
21
22 type BlockAPI CoreAPI
core/coreapi/coreapi.go
+3 -3
@@ -39,10 +39,10 @@ import (
39 record "github.com/libp2p/go-libp2p-record"
40 madns "github.com/multiformats/go-multiaddr-dns"
41
42 - "github.com/ipfs/go-ipfs/core"
43 - "github.com/ipfs/go-ipfs/core/node"
44 - "github.com/ipfs/go-ipfs/repo"
42 "github.com/ipfs/go-namesys"
43 + "github.com/ipfs/kubo/core"
44 + "github.com/ipfs/kubo/core/node"
45 + "github.com/ipfs/kubo/repo"
46 )
47
48 type CoreAPI struct {
core/coreapi/dag.go
+1 -1
@@ -5,9 +5,9 @@ import (
5
6 cid "github.com/ipfs/go-cid"
7 pin "github.com/ipfs/go-ipfs-pinner"
8 - "github.com/ipfs/go-ipfs/tracing"
8 ipld "github.com/ipfs/go-ipld-format"
9 dag "github.com/ipfs/go-merkledag"
10 + "github.com/ipfs/kubo/tracing"
11 "go.opentelemetry.io/otel/attribute"
12 "go.opentelemetry.io/otel/trace"
13 )
core/coreapi/dht.go
+1 -1
@@ -9,11 +9,11 @@ import (
9 cidutil "github.com/ipfs/go-cidutil"
10 blockstore "github.com/ipfs/go-ipfs-blockstore"
11 offline "github.com/ipfs/go-ipfs-exchange-offline"
12 - "github.com/ipfs/go-ipfs/tracing"
12 dag "github.com/ipfs/go-merkledag"
13 coreiface "github.com/ipfs/interface-go-ipfs-core"
14 caopts "github.com/ipfs/interface-go-ipfs-core/options"
15 path "github.com/ipfs/interface-go-ipfs-core/path"
16 + "github.com/ipfs/kubo/tracing"
17 peer "github.com/libp2p/go-libp2p-core/peer"
18 routing "github.com/libp2p/go-libp2p-core/routing"
19 "go.opentelemetry.io/otel/attribute"
core/coreapi/key.go
+1 -1
@@ -7,11 +7,11 @@ import (
7 "fmt"
8 "sort"
9
10 - "github.com/ipfs/go-ipfs/tracing"
10 ipfspath "github.com/ipfs/go-path"
11 coreiface "github.com/ipfs/interface-go-ipfs-core"
12 caopts "github.com/ipfs/interface-go-ipfs-core/options"
13 path "github.com/ipfs/interface-go-ipfs-core/path"
14 + "github.com/ipfs/kubo/tracing"
15 crypto "github.com/libp2p/go-libp2p-core/crypto"
16 peer "github.com/libp2p/go-libp2p-core/peer"
17 "go.opentelemetry.io/otel/attribute"
core/coreapi/name.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "time"
8
9 keystore "github.com/ipfs/go-ipfs-keystore"
10 - "github.com/ipfs/go-ipfs/tracing"
10 "github.com/ipfs/go-namesys"
11 + "github.com/ipfs/kubo/tracing"
12 "go.opentelemetry.io/otel/attribute"
13 "go.opentelemetry.io/otel/trace"
14
core/coreapi/object.go
+1 -1
@@ -12,7 +12,6 @@ import (
12
13 cid "github.com/ipfs/go-cid"
14 pin "github.com/ipfs/go-ipfs-pinner"
15 - "github.com/ipfs/go-ipfs/tracing"
15 ipld "github.com/ipfs/go-ipld-format"
16 dag "github.com/ipfs/go-merkledag"
17 "github.com/ipfs/go-merkledag/dagutils"
@@ -20,6 +19,7 @@ import (
19 coreiface "github.com/ipfs/interface-go-ipfs-core"
20 caopts "github.com/ipfs/interface-go-ipfs-core/options"
21 ipath "github.com/ipfs/interface-go-ipfs-core/path"
22 + "github.com/ipfs/kubo/tracing"
23 "go.opentelemetry.io/otel/attribute"
24 "go.opentelemetry.io/otel/trace"
25 )
core/coreapi/path.go
+1 -1
@@ -5,8 +5,8 @@ import (
5 "fmt"
6 gopath "path"
7
8 - "github.com/ipfs/go-ipfs/tracing"
8 "github.com/ipfs/go-namesys/resolve"
9 + "github.com/ipfs/kubo/tracing"
10
11 "go.opentelemetry.io/otel/attribute"
12 "go.opentelemetry.io/otel/trace"
core/coreapi/pin.go
+1 -1
@@ -8,11 +8,11 @@ import (
8 "github.com/ipfs/go-cid"
9 offline "github.com/ipfs/go-ipfs-exchange-offline"
10 pin "github.com/ipfs/go-ipfs-pinner"
11 - "github.com/ipfs/go-ipfs/tracing"
11 "github.com/ipfs/go-merkledag"
12 coreiface "github.com/ipfs/interface-go-ipfs-core"
13 caopts "github.com/ipfs/interface-go-ipfs-core/options"
14 "github.com/ipfs/interface-go-ipfs-core/path"
15 + "github.com/ipfs/kubo/tracing"
16 "go.opentelemetry.io/otel/attribute"
17 "go.opentelemetry.io/otel/trace"
18 )
core/coreapi/pubsub.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "context"
5 "errors"
6
7 - "github.com/ipfs/go-ipfs/tracing"
7 coreiface "github.com/ipfs/interface-go-ipfs-core"
8 caopts "github.com/ipfs/interface-go-ipfs-core/options"
9 + "github.com/ipfs/kubo/tracing"
10 peer "github.com/libp2p/go-libp2p-core/peer"
11 routing "github.com/libp2p/go-libp2p-core/routing"
12 pubsub "github.com/libp2p/go-libp2p-pubsub"
core/coreapi/swarm.go
+1 -1
@@ -5,8 +5,8 @@ import (
5 "sort"
6 "time"
7
8 - "github.com/ipfs/go-ipfs/tracing"
8 coreiface "github.com/ipfs/interface-go-ipfs-core"
9 + "github.com/ipfs/kubo/tracing"
10 inet "github.com/libp2p/go-libp2p-core/network"
11 "github.com/libp2p/go-libp2p-core/peer"
12 pstore "github.com/libp2p/go-libp2p-core/peerstore"
core/coreapi/test/api_test.go
+7 -7
@@ -10,18 +10,18 @@ import (
10
11 "github.com/ipfs/go-filestore"
12 keystore "github.com/ipfs/go-ipfs-keystore"
13 - "github.com/ipfs/go-ipfs/core"
14 - "github.com/ipfs/go-ipfs/core/bootstrap"
15 - "github.com/ipfs/go-ipfs/core/coreapi"
16 - mock "github.com/ipfs/go-ipfs/core/mock"
17 - "github.com/ipfs/go-ipfs/core/node/libp2p"
18 - "github.com/ipfs/go-ipfs/repo"
13 + "github.com/ipfs/kubo/core"
14 + "github.com/ipfs/kubo/core/bootstrap"
15 + "github.com/ipfs/kubo/core/coreapi"
16 + mock "github.com/ipfs/kubo/core/mock"
17 + "github.com/ipfs/kubo/core/node/libp2p"
18 + "github.com/ipfs/kubo/repo"
19
20 "github.com/ipfs/go-datastore"
21 syncds "github.com/ipfs/go-datastore/sync"
22 - "github.com/ipfs/go-ipfs/config"
22 coreiface "github.com/ipfs/interface-go-ipfs-core"
23 "github.com/ipfs/interface-go-ipfs-core/tests"
24 + "github.com/ipfs/kubo/config"
25 "github.com/libp2p/go-libp2p-core/crypto"
26 "github.com/libp2p/go-libp2p-core/peer"
27 mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
core/coreapi/unixfs.go
+4 -4
@@ -5,12 +5,12 @@ import (
5 "fmt"
6 "sync"
7
8 - "github.com/ipfs/go-ipfs/core"
9 - "github.com/ipfs/go-ipfs/tracing"
8 + "github.com/ipfs/kubo/core"
9 + "github.com/ipfs/kubo/tracing"
10 "go.opentelemetry.io/otel/attribute"
11 "go.opentelemetry.io/otel/trace"
12
13 - "github.com/ipfs/go-ipfs/core/coreunix"
13 + "github.com/ipfs/kubo/core/coreunix"
14
15 blockservice "github.com/ipfs/go-blockservice"
16 cid "github.com/ipfs/go-cid"
@@ -96,7 +96,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
96 //}
97
98 if settings.NoCopy && !(cfg.Experimental.FilestoreEnabled || cfg.Experimental.UrlstoreEnabled) {
99 - 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")
99 + 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")
100 }
101
102 addblockstore := api.blockstore
core/corehttp/commands.go
+5 -5
@@ -9,15 +9,15 @@ import (
9 "strconv"
10 "strings"
11
12 - version "github.com/ipfs/go-ipfs"
13 - oldcmds "github.com/ipfs/go-ipfs/commands"
14 - "github.com/ipfs/go-ipfs/core"
15 - corecommands "github.com/ipfs/go-ipfs/core/commands"
12 + version "github.com/ipfs/kubo"
13 + oldcmds "github.com/ipfs/kubo/commands"
14 + "github.com/ipfs/kubo/core"
15 + corecommands "github.com/ipfs/kubo/core/commands"
16
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 cmdsHttp "github.com/ipfs/go-ipfs-cmds/http"
19 - config "github.com/ipfs/go-ipfs/config"
19 path "github.com/ipfs/go-path"
20 + config "github.com/ipfs/kubo/config"
21 )
22
23 var (
core/corehttp/corehttp.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 "net/http"
12 "time"
13
14 - core "github.com/ipfs/go-ipfs/core"
14 logging "github.com/ipfs/go-log"
15 + core "github.com/ipfs/kubo/core"
16 "github.com/jbenet/goprocess"
17 periodicproc "github.com/jbenet/goprocess/periodic"
18 ma "github.com/multiformats/go-multiaddr"
core/corehttp/gateway.go
+3 -3
@@ -6,9 +6,9 @@ import (
6 "net/http"
7 "sort"
8
9 - version "github.com/ipfs/go-ipfs"
10 - core "github.com/ipfs/go-ipfs/core"
11 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
9 + version "github.com/ipfs/kubo"
10 + core "github.com/ipfs/kubo/core"
11 + coreapi "github.com/ipfs/kubo/core/coreapi"
12 "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
13
14 options "github.com/ipfs/interface-go-ipfs-core/options"
core/corehttp/gateway_handler.go
+8 -8
@@ -189,7 +189,7 @@ func newGatewaySummaryMetric(name string, help string) *prometheus.SummaryVec {
189
190 func newGatewayHistogramMetric(name string, help string) *prometheus.HistogramVec {
191 // We can add buckets as a parameter in the future, but for now using static defaults
192 - // suggested in https://github.com/ipfs/go-ipfs/issues/8441
192 + // suggested in https://github.com/ipfs/kubo/issues/8441
193 defaultBuckets := []float64{0.05, 0.1, 0.25, 0.5, 1, 2, 5, 10, 30, 60}
194 histogramMetric := prometheus.NewHistogramVec(
195 prometheus.HistogramOpts{
@@ -666,11 +666,11 @@ func addCacheControlHeaders(w http.ResponseWriter, r *http.Request, contentPath
666 // mutable namespaces such as /ipns/ can't be cached forever
667
668 /* For now we set Last-Modified to Now() to leverage caching heuristics built into modern browsers:
669 - * https://github.com/ipfs/go-ipfs/pull/8074#pullrequestreview-645196768
669 + * https://github.com/ipfs/kubo/pull/8074#pullrequestreview-645196768
670 * but we should not set it to fake values and use Cache-Control based on TTL instead */
671 modtime = time.Now()
672
673 - // TODO: set Cache-Control based on TTL of IPNS/DNSLink: https://github.com/ipfs/go-ipfs/issues/1818#issuecomment-1015849462
673 + // TODO: set Cache-Control based on TTL of IPNS/DNSLink: https://github.com/ipfs/kubo/issues/1818#issuecomment-1015849462
674 // TODO: set Last-Modified based on /ipns/ publishing timestamp?
675 } else {
676 // immutable! CACHE ALL THE THINGS, FOREVER! wolololol
@@ -679,7 +679,7 @@ func addCacheControlHeaders(w http.ResponseWriter, r *http.Request, contentPath
679 // Set modtime to 'zero time' to disable Last-Modified header (superseded by Cache-Control)
680 modtime = noModtime
681
682 - // TODO: set Last-Modified? - TBD - /ipfs/ modification metadata is present in unixfs 1.5 https://github.com/ipfs/go-ipfs/issues/6920?
682 + // TODO: set Last-Modified? - TBD - /ipfs/ modification metadata is present in unixfs 1.5 https://github.com/ipfs/kubo/issues/6920?
683 }
684
685 return modtime
@@ -874,7 +874,7 @@ func getEtag(r *http.Request, cid cid.Cid) string {
874 // Etag: "cid.foo" (gives us nice compression together with Content-Disposition in block (raw) and car responses)
875 suffix = `.` + f + suffix
876 }
877 - // TODO: include selector suffix when https://github.com/ipfs/go-ipfs/issues/8769 lands
877 + // TODO: include selector suffix when https://github.com/ipfs/kubo/issues/8769 lands
878 return prefix + cid.String() + suffix
879 }
880
@@ -957,10 +957,10 @@ func debugStr(path string) string {
957 }
958
959 func handleUnsupportedHeaders(r *http.Request) (err *requestError) {
960 - // X-Ipfs-Gateway-Prefix was removed (https://github.com/ipfs/go-ipfs/issues/7702)
960 + // X-Ipfs-Gateway-Prefix was removed (https://github.com/ipfs/kubo/issues/7702)
961 // TODO: remove this after go-ipfs 0.13 ships
962 if prfx := r.Header.Get("X-Ipfs-Gateway-Prefix"); prfx != "" {
963 - err := fmt.Errorf("X-Ipfs-Gateway-Prefix support was removed: https://github.com/ipfs/go-ipfs/issues/7702")
963 + err := fmt.Errorf("X-Ipfs-Gateway-Prefix support was removed: https://github.com/ipfs/kubo/issues/7702")
964 return newRequestError("unsupported HTTP header", err, http.StatusBadRequest)
965 }
966 return nil
@@ -996,7 +996,7 @@ func handleProtocolHandlerRedirect(w http.ResponseWriter, r *http.Request, logge
996 }
997
998 // Disallow Service Worker registration on namespace roots
999 -// https://github.com/ipfs/go-ipfs/issues/4025
999 +// https://github.com/ipfs/kubo/issues/4025
1000 func handleServiceWorkerRegistration(r *http.Request) (err *requestError) {
1001 if r.Header.Get("Service-Worker") == "script" {
1002 matched, _ := regexp.MatchString(`^/ip[fn]s/[^/]+$`, r.URL.Path)
core/corehttp/gateway_handler_block.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "net/http"
8 "time"
9
10 - "github.com/ipfs/go-ipfs/tracing"
10 ipath "github.com/ipfs/interface-go-ipfs-core/path"
11 + "github.com/ipfs/kubo/tracing"
12 "go.opentelemetry.io/otel/attribute"
13 "go.opentelemetry.io/otel/trace"
14 )
core/corehttp/gateway_handler_car.go
+2 -2
@@ -8,9 +8,9 @@ import (
8
9 blocks "github.com/ipfs/go-block-format"
10 cid "github.com/ipfs/go-cid"
11 - "github.com/ipfs/go-ipfs/tracing"
11 coreiface "github.com/ipfs/interface-go-ipfs-core"
12 ipath "github.com/ipfs/interface-go-ipfs-core/path"
13 + "github.com/ipfs/kubo/tracing"
14 gocar "github.com/ipld/go-car"
15 selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse"
16 "go.opentelemetry.io/otel/attribute"
@@ -71,7 +71,7 @@ func (i *gatewayHandler) serveCAR(ctx context.Context, w http.ResponseWriter, r
71 // Same go-car settings as dag.export command
72 store := dagStore{dag: i.api.Dag(), ctx: ctx}
73
74 - // TODO: support selectors passed as request param: https://github.com/ipfs/go-ipfs/issues/8769
74 + // TODO: support selectors passed as request param: https://github.com/ipfs/kubo/issues/8769
75 dag := gocar.Dag{Root: rootCid, Selector: selectorparse.CommonSelector_ExploreAllRecursively}
76 car := gocar.NewSelectiveCar(ctx, store, []gocar.Dag{dag}, gocar.TraverseLinksOnlyOnce())
77
core/corehttp/gateway_handler_unixfs.go
+1 -1
@@ -8,8 +8,8 @@ import (
8 "time"
9
10 files "github.com/ipfs/go-ipfs-files"
11 - "github.com/ipfs/go-ipfs/tracing"
11 ipath "github.com/ipfs/interface-go-ipfs-core/path"
12 + "github.com/ipfs/kubo/tracing"
13 "go.opentelemetry.io/otel/attribute"
14 "go.opentelemetry.io/otel/trace"
15 "go.uber.org/zap"
core/corehttp/gateway_handler_unixfs_dir.go
+4 -4
@@ -11,12 +11,12 @@ import (
11 "github.com/dustin/go-humanize"
12 cid "github.com/ipfs/go-cid"
13 files "github.com/ipfs/go-ipfs-files"
14 - "github.com/ipfs/go-ipfs/assets"
15 - "github.com/ipfs/go-ipfs/tracing"
14 path "github.com/ipfs/go-path"
15 "github.com/ipfs/go-path/resolver"
16 options "github.com/ipfs/interface-go-ipfs-core/options"
17 ipath "github.com/ipfs/interface-go-ipfs-core/path"
18 + "github.com/ipfs/kubo/assets"
19 + "github.com/ipfs/kubo/tracing"
20 "go.opentelemetry.io/otel/attribute"
21 "go.opentelemetry.io/otel/trace"
22 "go.uber.org/zap"
@@ -81,7 +81,7 @@ func (i *gatewayHandler) serveDirectory(ctx context.Context, w http.ResponseWrit
81 }
82
83 // See statusResponseWriter.WriteHeader
84 - // and https://github.com/ipfs/go-ipfs/issues/7164
84 + // and https://github.com/ipfs/kubo/issues/7164
85 // Note: this needs to occur before listingTemplate.Execute otherwise we get
86 // superfluous response.WriteHeader call from prometheus/client_golang
87 if w.Header().Get("Location") != "" {
@@ -146,7 +146,7 @@ func (i *gatewayHandler) serveDirectory(ctx context.Context, w http.ResponseWrit
146 }
147
148 // construct the correct back link
149 - // https://github.com/ipfs/go-ipfs/issues/1365
149 + // https://github.com/ipfs/kubo/issues/1365
150 var backLink string = originalUrlPath
151
152 // don't go further up than /ipfs/$hash/
core/corehttp/gateway_handler_unixfs_file.go
+3 -3
@@ -12,8 +12,8 @@ import (
12
13 "github.com/gabriel-vasile/mimetype"
14 files "github.com/ipfs/go-ipfs-files"
15 - "github.com/ipfs/go-ipfs/tracing"
15 ipath "github.com/ipfs/interface-go-ipfs-core/path"
16 + "github.com/ipfs/kubo/tracing"
17 "go.opentelemetry.io/otel/attribute"
18 "go.opentelemetry.io/otel/trace"
19 )
@@ -54,7 +54,7 @@ func (i *gatewayHandler) serveFile(ctx context.Context, w http.ResponseWriter, r
54 ctype = mime.TypeByExtension(gopath.Ext(name))
55 if ctype == "" {
56 // uses https://github.com/gabriel-vasile/mimetype library to determine the content type.
57 - // Fixes https://github.com/ipfs/go-ipfs/issues/7252
57 + // Fixes https://github.com/ipfs/kubo/issues/7252
58 mimeType, err := mimetype.DetectReader(content)
59 if err != nil {
60 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
71 // Strip the encoding from the HTML Content-Type header and let the
72 // browser figure it out.
73 //
74 - // Fixes https://github.com/ipfs/go-ipfs/issues/2203
74 + // Fixes https://github.com/ipfs/kubo/issues/2203
75 if strings.HasPrefix(ctype, "text/html;") {
76 ctype = "text/html"
77 }
core/corehttp/gateway_indexPage.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "path"
7 "strings"
8
9 - "github.com/ipfs/go-ipfs/assets"
9 ipfspath "github.com/ipfs/go-path"
10 + "github.com/ipfs/kubo/assets"
11 )
12
13 // structs for directory listing
core/corehttp/gateway_test.go
+5 -5
@@ -11,20 +11,20 @@ import (
11 "testing"
12 "time"
13
14 - version "github.com/ipfs/go-ipfs"
15 - core "github.com/ipfs/go-ipfs/core"
16 - "github.com/ipfs/go-ipfs/core/coreapi"
17 - repo "github.com/ipfs/go-ipfs/repo"
14 namesys "github.com/ipfs/go-namesys"
15 + version "github.com/ipfs/kubo"
16 + core "github.com/ipfs/kubo/core"
17 + "github.com/ipfs/kubo/core/coreapi"
18 + repo "github.com/ipfs/kubo/repo"
19
20 datastore "github.com/ipfs/go-datastore"
21 syncds "github.com/ipfs/go-datastore/sync"
22 files "github.com/ipfs/go-ipfs-files"
23 - config "github.com/ipfs/go-ipfs/config"
23 path "github.com/ipfs/go-path"
24 iface "github.com/ipfs/interface-go-ipfs-core"
25 nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
26 ipath "github.com/ipfs/interface-go-ipfs-core/path"
27 + config "github.com/ipfs/kubo/config"
28 ci "github.com/libp2p/go-libp2p-core/crypto"
29 id "github.com/libp2p/go-libp2p/p2p/protocol/identify"
30 )
core/corehttp/hostname.go
+6 -6
@@ -10,18 +10,18 @@ import (
10 "strings"
11
12 cid "github.com/ipfs/go-cid"
13 - core "github.com/ipfs/go-ipfs/core"
14 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
13 namesys "github.com/ipfs/go-namesys"
14 + core "github.com/ipfs/kubo/core"
15 + coreapi "github.com/ipfs/kubo/core/coreapi"
16 "github.com/libp2p/go-libp2p-core/peer"
17 dns "github.com/miekg/dns"
18
19 mbase "github.com/multiformats/go-multibase"
20
21 - config "github.com/ipfs/go-ipfs/config"
21 iface "github.com/ipfs/interface-go-ipfs-core"
22 options "github.com/ipfs/interface-go-ipfs-core/options"
23 nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
24 + config "github.com/ipfs/kubo/config"
25 )
26
27 var defaultPaths = []string{"/ipfs/", "/ipns/", "/api/", "/p2p/"}
@@ -506,13 +506,13 @@ func toSubdomainURL(hostname, path string, r *http.Request, ipfs iface.CoreAPI)
506 // Normalizations specific to /ipns/{libp2p-key}
507 if isPeerIDNamespace(ns) {
508 // Using Base36 for /ipns/ for consistency
509 - // Context: https://github.com/ipfs/go-ipfs/pull/7441#discussion_r452372828
509 + // Context: https://github.com/ipfs/kubo/pull/7441#discussion_r452372828
510 base = mbase.Base36
511
512 // PeerIDs represented as CIDv1 are expected to have libp2p-key
513 // multicodec (https://github.com/libp2p/specs/pull/209).
514 // We ease the transition by fixing multicodec on the fly:
515 - // https://github.com/ipfs/go-ipfs/issues/5287#issuecomment-492163929
515 + // https://github.com/ipfs/kubo/issues/5287#issuecomment-492163929
516 if multicodec != cid.Libp2pKey {
517 multicodec = cid.Libp2pKey
518 }
@@ -531,7 +531,7 @@ func toSubdomainURL(hostname, path string, r *http.Request, ipfs iface.CoreAPI)
531 return "", err
532 }
533 // 2. Make sure CID fits in a DNS label, adjust encoding if needed
534 - // (https://github.com/ipfs/go-ipfs/issues/7318)
534 + // (https://github.com/ipfs/kubo/issues/7318)
535 rootID, err = toDNSLabel(rootID, rootCID)
536 if err != nil {
537 return "", err
core/corehttp/hostname_test.go
+2 -2
@@ -8,9 +8,9 @@ import (
8
9 cid "github.com/ipfs/go-cid"
10 files "github.com/ipfs/go-ipfs-files"
11 - config "github.com/ipfs/go-ipfs/config"
12 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
11 path "github.com/ipfs/go-path"
12 + config "github.com/ipfs/kubo/config"
13 + coreapi "github.com/ipfs/kubo/core/coreapi"
14 )
15
16 func TestToSubdomainURL(t *testing.T) {
core/corehttp/logs.go
+1 -1
@@ -5,8 +5,8 @@ import (
5 "net"
6 "net/http"
7
8 - core "github.com/ipfs/go-ipfs/core"
8 lwriter "github.com/ipfs/go-log/writer"
9 + core "github.com/ipfs/kubo/core"
10 )
11
12 type writeErrNotifier struct {
core/corehttp/metrics.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "net/http"
6 "time"
7
8 - core "github.com/ipfs/go-ipfs/core"
8 + core "github.com/ipfs/kubo/core"
9 "go.opencensus.io/stats/view"
10 "go.opencensus.io/zpages"
11
core/corehttp/metrics_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "testing"
6 "time"
7
8 - "github.com/ipfs/go-ipfs/core"
8 + "github.com/ipfs/kubo/core"
9
10 inet "github.com/libp2p/go-libp2p-core/network"
11 bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
core/corehttp/mutex_profile.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "runtime"
7 "strconv"
8
9 - core "github.com/ipfs/go-ipfs/core"
9 + core "github.com/ipfs/kubo/core"
10 )
11
12 // MutexFractionOption allows to set runtime.SetMutexProfileFraction via HTTP
core/corehttp/option_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "net/http/httptest"
8 "testing"
9
10 - version "github.com/ipfs/go-ipfs"
10 + version "github.com/ipfs/kubo"
11 )
12
13 type testcasecheckversion struct {
core/corehttp/p2p_proxy.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "net/url"
9 "strings"
10
11 - core "github.com/ipfs/go-ipfs/core"
11 + core "github.com/ipfs/kubo/core"
12 peer "github.com/libp2p/go-libp2p-core/peer"
13
14 protocol "github.com/libp2p/go-libp2p-core/protocol"
core/corehttp/p2p_proxy_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "strings"
6 "testing"
7
8 - "github.com/ipfs/go-ipfs/thirdparty/assert"
8 + "github.com/ipfs/kubo/thirdparty/assert"
9
10 protocol "github.com/libp2p/go-libp2p-core/protocol"
11 )
core/corehttp/redirect.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "net"
5 "net/http"
6
7 - core "github.com/ipfs/go-ipfs/core"
7 + core "github.com/ipfs/kubo/core"
8 )
9
10 func RedirectOption(path string, redirect string) ServeOption {
core/corerepo/gc.go
+3 -3
@@ -6,9 +6,9 @@ import (
6 "errors"
7 "time"
8
9 - "github.com/ipfs/go-ipfs/core"
10 - "github.com/ipfs/go-ipfs/gc"
11 - "github.com/ipfs/go-ipfs/repo"
9 + "github.com/ipfs/kubo/core"
10 + "github.com/ipfs/kubo/gc"
11 + "github.com/ipfs/kubo/repo"
12
13 "github.com/dustin/go-humanize"
14 "github.com/ipfs/go-cid"
core/corerepo/stat.go
+2 -2
@@ -6,8 +6,8 @@ import (
6
7 context "context"
8
9 - "github.com/ipfs/go-ipfs/core"
10 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
9 + "github.com/ipfs/kubo/core"
10 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
11
12 humanize "github.com/dustin/go-humanize"
13 )
core/coreunix/add.go
+1 -1
@@ -14,7 +14,6 @@ import (
14 files "github.com/ipfs/go-ipfs-files"
15 pin "github.com/ipfs/go-ipfs-pinner"
16 posinfo "github.com/ipfs/go-ipfs-posinfo"
17 - "github.com/ipfs/go-ipfs/tracing"
17 ipld "github.com/ipfs/go-ipld-format"
18 logging "github.com/ipfs/go-log"
19 dag "github.com/ipfs/go-merkledag"
@@ -25,6 +24,7 @@ import (
24 "github.com/ipfs/go-unixfs/importer/trickle"
25 coreiface "github.com/ipfs/interface-go-ipfs-core"
26 "github.com/ipfs/interface-go-ipfs-core/path"
27 + "github.com/ipfs/kubo/tracing"
28 )
29
30 var log = logging.Logger("coreunix")
core/coreunix/add_test.go
+4 -4
@@ -10,9 +10,9 @@ import (
10 "testing"
11 "time"
12
13 - "github.com/ipfs/go-ipfs/core"
14 - "github.com/ipfs/go-ipfs/gc"
15 - "github.com/ipfs/go-ipfs/repo"
13 + "github.com/ipfs/kubo/core"
14 + "github.com/ipfs/kubo/gc"
15 + "github.com/ipfs/kubo/repo"
16
17 blocks "github.com/ipfs/go-block-format"
18 "github.com/ipfs/go-blockservice"
@@ -22,9 +22,9 @@ import (
22 blockstore "github.com/ipfs/go-ipfs-blockstore"
23 files "github.com/ipfs/go-ipfs-files"
24 pi "github.com/ipfs/go-ipfs-posinfo"
25 - config "github.com/ipfs/go-ipfs/config"
25 dag "github.com/ipfs/go-merkledag"
26 coreiface "github.com/ipfs/interface-go-ipfs-core"
27 + config "github.com/ipfs/kubo/config"
28 )
29
30 const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
core/coreunix/metadata.go
+1 -1
@@ -2,9 +2,9 @@ package coreunix
2
3 import (
4 cid "github.com/ipfs/go-cid"
5 - core "github.com/ipfs/go-ipfs/core"
5 dag "github.com/ipfs/go-merkledag"
6 ft "github.com/ipfs/go-unixfs"
7 + core "github.com/ipfs/kubo/core"
8 )
9
10 func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) {
core/coreunix/metadata_test.go
+1 -1
@@ -7,11 +7,11 @@ import (
7 "testing"
8
9 bserv "github.com/ipfs/go-blockservice"
10 - core "github.com/ipfs/go-ipfs/core"
10 merkledag "github.com/ipfs/go-merkledag"
11 ft "github.com/ipfs/go-unixfs"
12 importer "github.com/ipfs/go-unixfs/importer"
13 uio "github.com/ipfs/go-unixfs/io"
14 + core "github.com/ipfs/kubo/core"
15
16 cid "github.com/ipfs/go-cid"
17 ds "github.com/ipfs/go-datastore"
core/mock/mock.go
+5 -5
@@ -5,15 +5,15 @@ import (
5 "fmt"
6 "io"
7
8 - libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p"
8 + libp2p2 "github.com/ipfs/kubo/core/node/libp2p"
9
10 - "github.com/ipfs/go-ipfs/commands"
11 - "github.com/ipfs/go-ipfs/core"
12 - "github.com/ipfs/go-ipfs/repo"
10 + "github.com/ipfs/kubo/commands"
11 + "github.com/ipfs/kubo/core"
12 + "github.com/ipfs/kubo/repo"
13
14 "github.com/ipfs/go-datastore"
15 syncds "github.com/ipfs/go-datastore/sync"
16 - config "github.com/ipfs/go-ipfs/config"
16 + config "github.com/ipfs/kubo/config"
17
18 "github.com/libp2p/go-libp2p"
19 "github.com/libp2p/go-libp2p-core/host"
core/node/bitswap.go
+3 -3
@@ -7,16 +7,16 @@ import (
7 "github.com/ipfs/go-bitswap/network"
8 blockstore "github.com/ipfs/go-ipfs-blockstore"
9 exchange "github.com/ipfs/go-ipfs-exchange-interface"
10 - config "github.com/ipfs/go-ipfs/config"
10 + config "github.com/ipfs/kubo/config"
11 "github.com/libp2p/go-libp2p-core/host"
12 "github.com/libp2p/go-libp2p-core/routing"
13 "go.uber.org/fx"
14
15 - "github.com/ipfs/go-ipfs/core/node/helpers"
15 + "github.com/ipfs/kubo/core/node/helpers"
16 )
17
18 const (
19 - // Docs: https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#internalbitswap
19 + // Docs: https://github.com/ipfs/kubo/blob/master/docs/config.md#internalbitswap
20 DefaultEngineBlockstoreWorkerCount = 128
21 DefaultTaskWorkerCount = 8
22 DefaultEngineTaskWorkerCount = 8
core/node/builder.go
+4 -4
@@ -8,13 +8,13 @@ import (
8
9 "go.uber.org/fx"
10
11 - "github.com/ipfs/go-ipfs/core/node/helpers"
12 - "github.com/ipfs/go-ipfs/core/node/libp2p"
13 - "github.com/ipfs/go-ipfs/repo"
11 + "github.com/ipfs/kubo/core/node/helpers"
12 + "github.com/ipfs/kubo/core/node/libp2p"
13 + "github.com/ipfs/kubo/repo"
14
15 ds "github.com/ipfs/go-datastore"
16 dsync "github.com/ipfs/go-datastore/sync"
17 - cfg "github.com/ipfs/go-ipfs/config"
17 + cfg "github.com/ipfs/kubo/config"
18 "github.com/libp2p/go-libp2p-core/crypto"
19 peer "github.com/libp2p/go-libp2p-core/peer"
20 )
core/node/core.go
+2 -2
@@ -25,8 +25,8 @@ import (
25 "github.com/ipld/go-ipld-prime/schema"
26 "go.uber.org/fx"
27
28 - "github.com/ipfs/go-ipfs/core/node/helpers"
29 - "github.com/ipfs/go-ipfs/repo"
28 + "github.com/ipfs/kubo/core/node/helpers"
29 + "github.com/ipfs/kubo/repo"
30 )
31
32 // BlockService creates new blockservice which provides an interface to fetch content-addressable blocks
core/node/dns.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "strings"
7 "time"
8
9 - config "github.com/ipfs/go-ipfs/config"
9 + config "github.com/ipfs/kubo/config"
10 doh "github.com/libp2p/go-doh-resolver"
11 madns "github.com/multiformats/go-multiaddr-dns"
12
core/node/graphsync.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 libp2p "github.com/libp2p/go-libp2p-core"
10 "go.uber.org/fx"
11
12 - "github.com/ipfs/go-ipfs/core/node/helpers"
12 + "github.com/ipfs/kubo/core/node/helpers"
13 )
14
15 // Graphsync constructs a graphsync
core/node/groups.go
+3 -3
@@ -8,13 +8,13 @@ import (
8
9 blockstore "github.com/ipfs/go-ipfs-blockstore"
10 util "github.com/ipfs/go-ipfs-util"
11 - "github.com/ipfs/go-ipfs/config"
11 "github.com/ipfs/go-log"
12 + "github.com/ipfs/kubo/config"
13 "github.com/libp2p/go-libp2p-core/peer"
14 pubsub "github.com/libp2p/go-libp2p-pubsub"
15
16 - "github.com/ipfs/go-ipfs/core/node/libp2p"
17 - "github.com/ipfs/go-ipfs/p2p"
16 + "github.com/ipfs/kubo/core/node/libp2p"
17 + "github.com/ipfs/kubo/p2p"
18
19 offline "github.com/ipfs/go-ipfs-exchange-offline"
20 offroute "github.com/ipfs/go-ipfs-routing/offline"
core/node/ipns.go
+1 -1
@@ -12,9 +12,9 @@ import (
12 "github.com/libp2p/go-libp2p-record"
13 madns "github.com/multiformats/go-multiaddr-dns"
14
15 - "github.com/ipfs/go-ipfs/repo"
15 "github.com/ipfs/go-namesys"
16 "github.com/ipfs/go-namesys/republisher"
17 + "github.com/ipfs/kubo/repo"
18 )
19
20 const DefaultIpnsCacheSize = 128
core/node/libp2p/discovery.go
+1 -1
@@ -10,7 +10,7 @@ import (
10
11 "go.uber.org/fx"
12
13 - "github.com/ipfs/go-ipfs/core/node/helpers"
13 + "github.com/ipfs/kubo/core/node/helpers"
14 )
15
16 const discoveryConnTimeout = time.Second * 30
core/node/libp2p/host.go
+2 -2
@@ -11,8 +11,8 @@ import (
11 record "github.com/libp2p/go-libp2p-record"
12 routedhost "github.com/libp2p/go-libp2p/p2p/host/routed"
13
14 - "github.com/ipfs/go-ipfs/core/node/helpers"
15 - "github.com/ipfs/go-ipfs/repo"
14 + "github.com/ipfs/kubo/core/node/helpers"
15 + "github.com/ipfs/kubo/repo"
16
17 "go.uber.org/fx"
18 )
core/node/libp2p/libp2p.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 "sort"
6 "time"
7
8 - version "github.com/ipfs/go-ipfs"
9 - config "github.com/ipfs/go-ipfs/config"
8 + version "github.com/ipfs/kubo"
9 + config "github.com/ipfs/kubo/config"
10
11 logging "github.com/ipfs/go-log"
12 "github.com/libp2p/go-libp2p"
core/node/libp2p/nat.go
+1 -1
@@ -3,7 +3,7 @@ package libp2p
3 import (
4 "time"
5
6 - config "github.com/ipfs/go-ipfs/config"
6 + config "github.com/ipfs/kubo/config"
7 "github.com/libp2p/go-libp2p"
8 )
9
core/node/libp2p/pnet.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "fmt"
7 "time"
8
9 - "github.com/ipfs/go-ipfs/repo"
9 + "github.com/ipfs/kubo/repo"
10
11 "github.com/libp2p/go-libp2p"
12 "github.com/libp2p/go-libp2p-core/host"
core/node/libp2p/pubsub.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 pubsub "github.com/libp2p/go-libp2p-pubsub"
7 "go.uber.org/fx"
8
9 - "github.com/ipfs/go-ipfs/core/node/helpers"
9 + "github.com/ipfs/kubo/core/node/helpers"
10 )
11
12 func FloodSub(pubsubOptions ...pubsub.Option) interface{} {
core/node/libp2p/rcmgr.go
+4 -3
@@ -8,10 +8,11 @@ import (
8 "strings"
9
10 "github.com/benbjohnson/clock"
11 - config "github.com/ipfs/go-ipfs/config"
12 - "github.com/ipfs/go-ipfs/core/node/helpers"
13 - "github.com/ipfs/go-ipfs/repo"
11 logging "github.com/ipfs/go-log/v2"
12 + config "github.com/ipfs/kubo/config"
13 + "github.com/ipfs/kubo/core/node/helpers"
14 + "github.com/ipfs/kubo/repo"
15 +
16 "github.com/libp2p/go-libp2p"
17 "github.com/libp2p/go-libp2p-core/network"
18 "github.com/libp2p/go-libp2p-core/peer"
core/node/libp2p/rcmgr_defaults.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "os"
8 "strings"
9
10 - config "github.com/ipfs/go-ipfs/config"
10 + config "github.com/ipfs/kubo/config"
11 "github.com/libp2p/go-libp2p"
12 rcmgr "github.com/libp2p/go-libp2p-resource-manager"
13
core/node/libp2p/relay.go
+1 -1
@@ -1,7 +1,7 @@
1 package libp2p
2
3 import (
4 - "github.com/ipfs/go-ipfs/config"
4 + "github.com/ipfs/kubo/config"
5 "github.com/libp2p/go-libp2p"
6 "github.com/libp2p/go-libp2p-core/peer"
7 "github.com/libp2p/go-libp2p/p2p/host/autorelay"
core/node/libp2p/routing.go
+3 -3
@@ -7,10 +7,10 @@ import (
7 "sort"
8 "time"
9
10 - "github.com/ipfs/go-ipfs/core/node/helpers"
10 + "github.com/ipfs/kubo/core/node/helpers"
11
12 - config "github.com/ipfs/go-ipfs/config"
13 - "github.com/ipfs/go-ipfs/repo"
12 + config "github.com/ipfs/kubo/config"
13 + "github.com/ipfs/kubo/repo"
14 "github.com/libp2p/go-libp2p-core/host"
15 "github.com/libp2p/go-libp2p-core/peer"
16 "github.com/libp2p/go-libp2p-core/routing"
core/node/libp2p/sec.go
+1 -1
@@ -1,7 +1,7 @@
1 package libp2p
2
3 import (
4 - "github.com/ipfs/go-ipfs/config"
4 + "github.com/ipfs/kubo/config"
5
6 "github.com/libp2p/go-libp2p"
7 "github.com/libp2p/go-libp2p/p2p/security/noise"
core/node/libp2p/smux.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "os"
6 "strings"
7
8 - "github.com/ipfs/go-ipfs/config"
8 + "github.com/ipfs/kubo/config"
9
10 "github.com/libp2p/go-libp2p"
11 "github.com/libp2p/go-libp2p-core/network"
core/node/libp2p/topicdiscovery.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "github.com/libp2p/go-libp2p/p2p/discovery/backoff"
10 disc "github.com/libp2p/go-libp2p/p2p/discovery/routing"
11
12 - "github.com/ipfs/go-ipfs/core/node/helpers"
12 + "github.com/ipfs/kubo/core/node/helpers"
13 "go.uber.org/fx"
14 )
15
core/node/libp2p/transport.go
+1 -1
@@ -3,7 +3,7 @@ package libp2p
3 import (
4 "fmt"
5
6 - "github.com/ipfs/go-ipfs/config"
6 + "github.com/ipfs/kubo/config"
7 "github.com/libp2p/go-libp2p"
8 "github.com/libp2p/go-libp2p-core/metrics"
9 libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
core/node/peering.go
+1 -1
@@ -3,7 +3,7 @@ package node
3 import (
4 "context"
5
6 - "github.com/ipfs/go-ipfs/peering"
6 + "github.com/ipfs/kubo/peering"
7 "github.com/libp2p/go-libp2p-core/host"
8 "github.com/libp2p/go-libp2p-core/peer"
9 "go.uber.org/fx"
core/node/provider.go
+3 -3
@@ -15,9 +15,9 @@ import (
15 "github.com/multiformats/go-multihash"
16 "go.uber.org/fx"
17
18 - "github.com/ipfs/go-ipfs/core/node/helpers"
19 - "github.com/ipfs/go-ipfs/core/node/libp2p"
20 - "github.com/ipfs/go-ipfs/repo"
18 + "github.com/ipfs/kubo/core/node/helpers"
19 + "github.com/ipfs/kubo/core/node/libp2p"
20 + "github.com/ipfs/kubo/repo"
21 )
22
23 const kReprovideFrequency = time.Hour * 12
core/node/storage.go
+4 -4
@@ -3,13 +3,13 @@ package node
3 import (
4 "github.com/ipfs/go-datastore"
5 blockstore "github.com/ipfs/go-ipfs-blockstore"
6 - config "github.com/ipfs/go-ipfs/config"
6 + config "github.com/ipfs/kubo/config"
7 "go.uber.org/fx"
8
9 "github.com/ipfs/go-filestore"
10 - "github.com/ipfs/go-ipfs/core/node/helpers"
11 - "github.com/ipfs/go-ipfs/repo"
12 - "github.com/ipfs/go-ipfs/thirdparty/verifbs"
10 + "github.com/ipfs/kubo/core/node/helpers"
11 + "github.com/ipfs/kubo/repo"
12 + "github.com/ipfs/kubo/thirdparty/verifbs"
13 )
14
15 // RepoConfig loads configuration from the repo
fuse/ipns/common.go
+1 -1
@@ -3,10 +3,10 @@ package ipns
3 import (
4 "context"
5
6 - "github.com/ipfs/go-ipfs/core"
6 nsys "github.com/ipfs/go-namesys"
7 path "github.com/ipfs/go-path"
8 ft "github.com/ipfs/go-unixfs"
9 + "github.com/ipfs/kubo/core"
10 ci "github.com/libp2p/go-libp2p-core/crypto"
11 )
12
fuse/ipns/ipns_test.go
+2 -2
@@ -15,8 +15,8 @@ import (
15
16 "bazil.org/fuse"
17
18 - core "github.com/ipfs/go-ipfs/core"
19 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
18 + core "github.com/ipfs/kubo/core"
19 + coreapi "github.com/ipfs/kubo/core/coreapi"
20
21 fstest "bazil.org/fuse/fs/fstestutil"
22 racedet "github.com/ipfs/go-detect-race"
fuse/ipns/mount_unix.go
+3 -3
@@ -5,9 +5,9 @@
5 package ipns
6
7 import (
8 - core "github.com/ipfs/go-ipfs/core"
9 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
10 - mount "github.com/ipfs/go-ipfs/fuse/mount"
8 + core "github.com/ipfs/kubo/core"
9 + coreapi "github.com/ipfs/kubo/core/coreapi"
10 + mount "github.com/ipfs/kubo/fuse/mount"
11 )
12
13 // Mount mounts ipns at a given location, and returns a mount.Mount instance.
fuse/node/mount_darwin.go
+8 -8
@@ -10,7 +10,7 @@ import (
10 "runtime"
11 "strings"
12
13 - core "github.com/ipfs/go-ipfs/core"
13 + core "github.com/ipfs/kubo/core"
14
15 "github.com/blang/semver/v4"
16 unix "golang.org/x/sys/unix"
@@ -39,7 +39,7 @@ It is recommended you install it from the OSXFUSE website:
39
40 For more help, see:
41
42 - https://github.com/ipfs/go-ipfs/issues/177
42 + https://github.com/ipfs/kubo/issues/177
43 `
44
45 // errStrNoFuseHeaders is included in the output of `go get <fuseVersionPkg>` if there
@@ -56,7 +56,7 @@ It is recommended you install it from the OSXFUSE website:
56
57 For more help, see:
58
59 - https://github.com/ipfs/go-ipfs/issues/177
59 + https://github.com/ipfs/kubo/issues/177
60 `
61
62 type errNeedFuseVersion struct {
@@ -82,8 +82,8 @@ version you have by running:
82
83 ipfs config --bool %s true
84
85 -[1]: https://github.com/ipfs/go-ipfs/issues/177
86 -[2]: https://github.com/ipfs/go-ipfs/pull/533
85 +[1]: https://github.com/ipfs/kubo/issues/177
86 +[2]: https://github.com/ipfs/kubo/pull/533
87 [3]: %s
88 `, fuseVersionPkg, dontCheckOSXFUSEConfigKey, me.cause)
89 }
@@ -113,8 +113,8 @@ trying to run these checks with:
113
114 ipfs config --bool %s true
115
116 -[1]: https://github.com/ipfs/go-ipfs/issues/177
117 -[2]: https://github.com/ipfs/go-ipfs/pull/533
116 +[1]: https://github.com/ipfs/kubo/issues/177
117 +[2]: https://github.com/ipfs/kubo/pull/533
118 [3]: %s
119 `
120
@@ -123,7 +123,7 @@ You may be able to get this error to go away by setting it again:
123
124 ipfs config --bool %s true
125
126 -Either way, please tell us at: http://github.com/ipfs/go-ipfs/issues
126 +Either way, please tell us at: http://github.com/ipfs/kubo/issues
127 `
128
129 func darwinFuseCheckVersion(node *core.IpfsNode) error {
fuse/node/mount_nofuse.go
+1 -1
@@ -6,7 +6,7 @@ package node
6 import (
7 "errors"
8
9 - core "github.com/ipfs/go-ipfs/core"
9 + core "github.com/ipfs/kubo/core"
10 )
11
12 func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
fuse/node/mount_notsupp.go
+2 -2
@@ -6,9 +6,9 @@ package node
6 import (
7 "errors"
8
9 - core "github.com/ipfs/go-ipfs/core"
9 + core "github.com/ipfs/kubo/core"
10 )
11
12 func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
13 - return errors.New("FUSE not supported on OpenBSD or NetBSD. See #5334 (https://github.com/ipfs/go-ipfs/issues/5334).")
13 + return errors.New("FUSE not supported on OpenBSD or NetBSD. See #5334 (https://github.com/ipfs/kubo/issues/5334).")
14 }
fuse/node/mount_test.go
+3 -3
@@ -13,9 +13,9 @@ import (
13
14 "context"
15
16 - core "github.com/ipfs/go-ipfs/core"
17 - ipns "github.com/ipfs/go-ipfs/fuse/ipns"
18 - mount "github.com/ipfs/go-ipfs/fuse/mount"
16 + core "github.com/ipfs/kubo/core"
17 + ipns "github.com/ipfs/kubo/fuse/ipns"
18 + mount "github.com/ipfs/kubo/fuse/mount"
19
20 ci "github.com/libp2p/go-libp2p-testing/ci"
21 )
fuse/node/mount_unix.go
+4 -4
@@ -9,10 +9,10 @@ import (
9 "strings"
10 "sync"
11
12 - core "github.com/ipfs/go-ipfs/core"
13 - ipns "github.com/ipfs/go-ipfs/fuse/ipns"
14 - mount "github.com/ipfs/go-ipfs/fuse/mount"
15 - rofs "github.com/ipfs/go-ipfs/fuse/readonly"
12 + core "github.com/ipfs/kubo/core"
13 + ipns "github.com/ipfs/kubo/fuse/ipns"
14 + mount "github.com/ipfs/kubo/fuse/mount"
15 + rofs "github.com/ipfs/kubo/fuse/readonly"
16
17 logging "github.com/ipfs/go-log"
18 )
fuse/node/mount_windows.go
+1 -1
@@ -1,7 +1,7 @@
1 package node
2
3 import (
4 - "github.com/ipfs/go-ipfs/core"
4 + "github.com/ipfs/kubo/core"
5 )
6
7 func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
fuse/readonly/ipfs_test.go
+3 -3
@@ -18,9 +18,9 @@ import (
18
19 "bazil.org/fuse"
20
21 - core "github.com/ipfs/go-ipfs/core"
22 - coreapi "github.com/ipfs/go-ipfs/core/coreapi"
23 - coremock "github.com/ipfs/go-ipfs/core/mock"
21 + core "github.com/ipfs/kubo/core"
22 + coreapi "github.com/ipfs/kubo/core/coreapi"
23 + coremock "github.com/ipfs/kubo/core/mock"
24
25 fstest "bazil.org/fuse/fs/fstestutil"
26 chunker "github.com/ipfs/go-ipfs-chunker"
fuse/readonly/mount_unix.go
+2 -2
@@ -5,8 +5,8 @@
5 package readonly
6
7 import (
8 - core "github.com/ipfs/go-ipfs/core"
9 - mount "github.com/ipfs/go-ipfs/fuse/mount"
8 + core "github.com/ipfs/kubo/core"
9 + mount "github.com/ipfs/kubo/fuse/mount"
10 )
11
12 // Mount mounts IPFS at a given location, and returns a mount.Mount instance.
fuse/readonly/readonly_unix.go
+1 -1
@@ -14,7 +14,6 @@ import (
14 fuse "bazil.org/fuse"
15 fs "bazil.org/fuse/fs"
16 "github.com/ipfs/go-cid"
17 - core "github.com/ipfs/go-ipfs/core"
17 ipld "github.com/ipfs/go-ipld-format"
18 logging "github.com/ipfs/go-log"
19 mdag "github.com/ipfs/go-merkledag"
@@ -22,6 +21,7 @@ import (
21 "github.com/ipfs/go-path/resolver"
22 ft "github.com/ipfs/go-unixfs"
23 uio "github.com/ipfs/go-unixfs/io"
24 + core "github.com/ipfs/kubo/core"
25 ipldprime "github.com/ipld/go-ipld-prime"
26 cidlink "github.com/ipld/go-ipld-prime/linking/cid"
27 )
go.mod
+1 -1
@@ -1,4 +1,4 @@
1 -module github.com/ipfs/go-ipfs
1 +module github.com/ipfs/kubo
2
3 require (
4 bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
mk/golang.mk
+2 -2
@@ -26,10 +26,10 @@ TEST_GO :=
26 TEST_GO_BUILD :=
27 CHECK_GO :=
28
29 -go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/go-ipfs/$(1))
29 +go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/kubo/$(1))
30 go-main-name=$(notdir $(call go-pkg-name,$(1)))$(?exe)
31 go-curr-pkg-tgt=$(d)/$(call go-main-name,$(d))
32 -go-pkgs=$(shell $(GOCC) list github.com/ipfs/go-ipfs/...)
32 +go-pkgs=$(shell $(GOCC) list github.com/ipfs/kubo/...)
33
34 go-tags=$(if $(GOTAGS), -tags="$(call join-with,$(space),$(GOTAGS))")
35 go-flags-with-tags=$(GOFLAGS)$(go-tags)
plugin/daemoninternal.go
+1 -1
@@ -1,6 +1,6 @@
1 package plugin
2
3 -import "github.com/ipfs/go-ipfs/core"
3 +import "github.com/ipfs/kubo/core"
4
5 // PluginDaemonInternal is an interface for daemon plugins. These plugins will be run on
6 // the daemon and will be given a direct access to the IpfsNode.
plugin/datastore.go
+1 -1
@@ -1,7 +1,7 @@
1 package plugin
2
3 import (
4 - "github.com/ipfs/go-ipfs/repo/fsrepo"
4 + "github.com/ipfs/kubo/repo/fsrepo"
5 )
6
7 // PluginDatastore is an interface that can be implemented to add handlers for
plugin/loader/load_nocgo.go
+1 -1
@@ -8,7 +8,7 @@ package loader
8 import (
9 "errors"
10
11 - iplugin "github.com/ipfs/go-ipfs/plugin"
11 + iplugin "github.com/ipfs/kubo/plugin"
12 )
13
14 func init() {
plugin/loader/load_noplugin.go
+1 -1
@@ -6,7 +6,7 @@ package loader
6 import (
7 "errors"
8
9 - iplugin "github.com/ipfs/go-ipfs/plugin"
9 + iplugin "github.com/ipfs/kubo/plugin"
10 )
11
12 func init() {
plugin/loader/load_unix.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "errors"
10 "plugin"
11
12 - iplugin "github.com/ipfs/go-ipfs/plugin"
12 + iplugin "github.com/ipfs/kubo/plugin"
13 )
14
15 func init() {
plugin/loader/loader.go
+6 -6
@@ -8,14 +8,14 @@ import (
8 "runtime"
9 "strings"
10
11 - config "github.com/ipfs/go-ipfs/config"
12 - cserialize "github.com/ipfs/go-ipfs/config/serialize"
11 + config "github.com/ipfs/kubo/config"
12 + cserialize "github.com/ipfs/kubo/config/serialize"
13 "github.com/ipld/go-ipld-prime/multicodec"
14
15 - "github.com/ipfs/go-ipfs/core"
16 - "github.com/ipfs/go-ipfs/core/coreapi"
17 - plugin "github.com/ipfs/go-ipfs/plugin"
18 - fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
15 + "github.com/ipfs/kubo/core"
16 + "github.com/ipfs/kubo/core/coreapi"
17 + plugin "github.com/ipfs/kubo/plugin"
18 + fsrepo "github.com/ipfs/kubo/repo/fsrepo"
19
20 logging "github.com/ipfs/go-log"
21 opentracing "github.com/opentracing/opentracing-go"
plugin/loader/preload.go
+6 -6
@@ -1,12 +1,12 @@
1 package loader
2
3 import (
4 - pluginbadgerds "github.com/ipfs/go-ipfs/plugin/plugins/badgerds"
5 - pluginiplddagjose "github.com/ipfs/go-ipfs/plugin/plugins/dagjose"
6 - pluginflatfs "github.com/ipfs/go-ipfs/plugin/plugins/flatfs"
7 - pluginipldgit "github.com/ipfs/go-ipfs/plugin/plugins/git"
8 - pluginlevelds "github.com/ipfs/go-ipfs/plugin/plugins/levelds"
9 - pluginpeerlog "github.com/ipfs/go-ipfs/plugin/plugins/peerlog"
4 + pluginbadgerds "github.com/ipfs/kubo/plugin/plugins/badgerds"
5 + pluginiplddagjose "github.com/ipfs/kubo/plugin/plugins/dagjose"
6 + pluginflatfs "github.com/ipfs/kubo/plugin/plugins/flatfs"
7 + pluginipldgit "github.com/ipfs/kubo/plugin/plugins/git"
8 + pluginlevelds "github.com/ipfs/kubo/plugin/plugins/levelds"
9 + pluginpeerlog "github.com/ipfs/kubo/plugin/plugins/peerlog"
10 )
11
12 // DO NOT EDIT THIS FILE
plugin/loader/preload.sh
+1 -1
@@ -8,7 +8,7 @@ to_preload() {
8 awk 'NF' $LIST | sed '/^#/d'
9 if [[ -n "$IPFS_PLUGINS" ]]; then
10 for plugin in $IPFS_PLUGINS; do
11 - echo "$plugin github.com/ipfs/go-ipfs/plugin/plugins/$plugin *"
11 + echo "$plugin github.com/ipfs/kubo/plugin/plugins/$plugin *"
12 done
13 fi
14 }
plugin/loader/preload_list
+6 -6
@@ -3,10 +3,10 @@
3 #
4 # name go-path number of the sub-plugin or *
5
6 -ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git *
7 -iplddagjose github.com/ipfs/go-ipfs/plugin/plugins/dagjose *
6 +ipldgit github.com/ipfs/kubo/plugin/plugins/git *
7 +iplddagjose github.com/ipfs/kubo/plugin/plugins/dagjose *
8
9 -badgerds github.com/ipfs/go-ipfs/plugin/plugins/badgerds *
10 -flatfs github.com/ipfs/go-ipfs/plugin/plugins/flatfs *
11 -levelds github.com/ipfs/go-ipfs/plugin/plugins/levelds *
12 -peerlog github.com/ipfs/go-ipfs/plugin/plugins/peerlog *
\ No newline at end of file
9 +badgerds github.com/ipfs/kubo/plugin/plugins/badgerds *
10 +flatfs github.com/ipfs/kubo/plugin/plugins/flatfs *
11 +levelds github.com/ipfs/kubo/plugin/plugins/levelds *
12 +peerlog github.com/ipfs/kubo/plugin/plugins/peerlog *
plugin/plugins/badgerds/badgerds.go
+3 -3
@@ -5,9 +5,9 @@ import (
5 "os"
6 "path/filepath"
7
8 - "github.com/ipfs/go-ipfs/plugin"
9 - "github.com/ipfs/go-ipfs/repo"
10 - "github.com/ipfs/go-ipfs/repo/fsrepo"
8 + "github.com/ipfs/kubo/plugin"
9 + "github.com/ipfs/kubo/repo"
10 + "github.com/ipfs/kubo/repo/fsrepo"
11
12 humanize "github.com/dustin/go-humanize"
13 badgerds "github.com/ipfs/go-ds-badger"
plugin/plugins/dagjose/dagjose.go
+1 -1
@@ -1,7 +1,7 @@
1 package dagjose
2
3 import (
4 - "github.com/ipfs/go-ipfs/plugin"
4 + "github.com/ipfs/kubo/plugin"
5
6 "github.com/ceramicnetwork/go-dag-jose/dagjose"
7 "github.com/ipld/go-ipld-prime/multicodec"
plugin/plugins/flatfs/flatfs.go
+3 -3
@@ -4,9 +4,9 @@ import (
4 "fmt"
5 "path/filepath"
6
7 - "github.com/ipfs/go-ipfs/plugin"
8 - "github.com/ipfs/go-ipfs/repo"
9 - "github.com/ipfs/go-ipfs/repo/fsrepo"
7 + "github.com/ipfs/kubo/plugin"
8 + "github.com/ipfs/kubo/repo"
9 + "github.com/ipfs/kubo/repo/fsrepo"
10
11 flatfs "github.com/ipfs/go-ds-flatfs"
12 )
plugin/plugins/git/git.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "compress/zlib"
5 "io"
6
7 - "github.com/ipfs/go-ipfs/plugin"
7 + "github.com/ipfs/kubo/plugin"
8
9 // Note that depending on this package registers it's multicodec encoder and decoder.
10 git "github.com/ipfs/go-ipld-git"
plugin/plugins/levelds/levelds.go
+3 -3
@@ -4,9 +4,9 @@ import (
4 "fmt"
5 "path/filepath"
6
7 - "github.com/ipfs/go-ipfs/plugin"
8 - "github.com/ipfs/go-ipfs/repo"
9 - "github.com/ipfs/go-ipfs/repo/fsrepo"
7 + "github.com/ipfs/kubo/plugin"
8 + "github.com/ipfs/kubo/repo"
9 + "github.com/ipfs/kubo/repo/fsrepo"
10
11 levelds "github.com/ipfs/go-ds-leveldb"
12 ldbopts "github.com/syndtr/goleveldb/leveldb/opt"
plugin/plugins/peerlog/peerlog.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "sync/atomic"
6 "time"
7
8 - core "github.com/ipfs/go-ipfs/core"
9 - plugin "github.com/ipfs/go-ipfs/plugin"
8 logging "github.com/ipfs/go-log"
9 + core "github.com/ipfs/kubo/core"
10 + plugin "github.com/ipfs/kubo/plugin"
11 event "github.com/libp2p/go-libp2p-core/event"
12 network "github.com/libp2p/go-libp2p-core/network"
13 "github.com/libp2p/go-libp2p-core/peer"
profile/profile.go
+1 -1
@@ -13,8 +13,8 @@ import (
13 "sync"
14 "time"
15
16 - version "github.com/ipfs/go-ipfs"
16 "github.com/ipfs/go-log"
17 + version "github.com/ipfs/kubo"
18 )
19
20 const (
repo/common/common_test.go
+1 -1
@@ -3,7 +3,7 @@ package common
3 import (
4 "testing"
5
6 - "github.com/ipfs/go-ipfs/thirdparty/assert"
6 + "github.com/ipfs/kubo/thirdparty/assert"
7 )
8
9 func TestMapMergeDeepReturnsNew(t *testing.T) {
repo/fsrepo/config_test.go
+3 -3
@@ -6,10 +6,10 @@ import (
6 "reflect"
7 "testing"
8
9 - "github.com/ipfs/go-ipfs/plugin/loader"
10 - "github.com/ipfs/go-ipfs/repo/fsrepo"
9 + "github.com/ipfs/kubo/plugin/loader"
10 + "github.com/ipfs/kubo/repo/fsrepo"
11
12 - "github.com/ipfs/go-ipfs/config"
12 + "github.com/ipfs/kubo/config"
13 )
14
15 // note: to test sorting of the mountpoints in the disk spec they are
repo/fsrepo/datastores.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "fmt"
7 "sort"
8
9 - "github.com/ipfs/go-ipfs/repo"
9 + "github.com/ipfs/kubo/repo"
10
11 ds "github.com/ipfs/go-datastore"
12 "github.com/ipfs/go-datastore/mount"
repo/fsrepo/fsrepo.go
+8 -8
@@ -12,18 +12,18 @@ import (
12
13 filestore "github.com/ipfs/go-filestore"
14 keystore "github.com/ipfs/go-ipfs-keystore"
15 - repo "github.com/ipfs/go-ipfs/repo"
16 - "github.com/ipfs/go-ipfs/repo/common"
17 - dir "github.com/ipfs/go-ipfs/thirdparty/dir"
15 + repo "github.com/ipfs/kubo/repo"
16 + "github.com/ipfs/kubo/repo/common"
17 + dir "github.com/ipfs/kubo/thirdparty/dir"
18
19 ds "github.com/ipfs/go-datastore"
20 measure "github.com/ipfs/go-ds-measure"
21 lockfile "github.com/ipfs/go-fs-lock"
22 util "github.com/ipfs/go-ipfs-util"
23 - config "github.com/ipfs/go-ipfs/config"
24 - serialize "github.com/ipfs/go-ipfs/config/serialize"
25 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
23 logging "github.com/ipfs/go-log"
24 + config "github.com/ipfs/kubo/config"
25 + serialize "github.com/ipfs/kubo/config/serialize"
26 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
27 homedir "github.com/mitchellh/go-homedir"
28 ma "github.com/multiformats/go-multiaddr"
29 )
@@ -417,7 +417,7 @@ func (r *FSRepo) openDatastore() error {
417 return fmt.Errorf("required Datastore.Spec entry missing from config file")
418 }
419 if r.config.Datastore.NoSync {
420 - 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.")
420 + 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.")
421 }
422
423 dsc, err := AnyDatastoreConfig(r.config.Datastore.Spec)
@@ -541,7 +541,7 @@ func (r *FSRepo) BackupConfig(prefix string) (string, error) {
541 // evidenced by the issue of `omitempty` property of fields that aren't defined
542 // by the user and Go still needs to initialize them to its default (which
543 // is not reflected in the repo's config file, see
544 -// https://github.com/ipfs/go-ipfs/issues/8088 for more details).
544 +// https://github.com/ipfs/kubo/issues/8088 for more details).
545 // In general we should call this API with a JSON nested maps as argument
546 // (`map[string]interface{}`). Many calls to this function are forced to
547 // synthesize the config.Config struct from their available JSON map just to
repo/fsrepo/fsrepo_test.go
+2 -2
@@ -7,10 +7,10 @@ import (
7 "path/filepath"
8 "testing"
9
10 - "github.com/ipfs/go-ipfs/thirdparty/assert"
10 + "github.com/ipfs/kubo/thirdparty/assert"
11
12 datastore "github.com/ipfs/go-datastore"
13 - config "github.com/ipfs/go-ipfs/config"
13 + config "github.com/ipfs/kubo/config"
14 )
15
16 // swap arg order
repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go
+6 -6
@@ -12,15 +12,15 @@ import (
12 "sync"
13
14 files "github.com/ipfs/go-ipfs-files"
15 - "github.com/ipfs/go-ipfs/config"
16 - "github.com/ipfs/go-ipfs/core"
17 - "github.com/ipfs/go-ipfs/core/coreapi"
18 - "github.com/ipfs/go-ipfs/core/node/libp2p"
19 - "github.com/ipfs/go-ipfs/repo/fsrepo"
20 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
15 iface "github.com/ipfs/interface-go-ipfs-core"
16 "github.com/ipfs/interface-go-ipfs-core/options"
17 ipath "github.com/ipfs/interface-go-ipfs-core/path"
18 + "github.com/ipfs/kubo/config"
19 + "github.com/ipfs/kubo/core"
20 + "github.com/ipfs/kubo/core/coreapi"
21 + "github.com/ipfs/kubo/core/node/libp2p"
22 + "github.com/ipfs/kubo/repo/fsrepo"
23 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
24 peer "github.com/libp2p/go-libp2p-core/peer"
25 )
26
repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher_test.go
+2 -2
@@ -9,8 +9,8 @@ import (
9 "path/filepath"
10 "testing"
11
12 - "github.com/ipfs/go-ipfs/plugin/loader"
13 - "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
12 + "github.com/ipfs/kubo/plugin/loader"
13 + "github.com/ipfs/kubo/repo/fsrepo/migrations"
14 )
15
16 func init() {
repo/fsrepo/migrations/migrations.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 "strings"
15 "sync"
16
17 - config "github.com/ipfs/go-ipfs/config"
17 + config "github.com/ipfs/kubo/config"
18 )
19
20 const (
repo/fsrepo/migrations/migrations_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "strings"
10 "testing"
11
12 - config "github.com/ipfs/go-ipfs/config"
12 + config "github.com/ipfs/kubo/config"
13 )
14
15 func TestFindMigrations(t *testing.T) {
repo/fsrepo/misc.go
+1 -1
@@ -3,7 +3,7 @@ package fsrepo
3 import (
4 "os"
5
6 - config "github.com/ipfs/go-ipfs/config"
6 + config "github.com/ipfs/kubo/config"
7 homedir "github.com/mitchellh/go-homedir"
8 )
9
repo/mock.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 filestore "github.com/ipfs/go-filestore"
8 keystore "github.com/ipfs/go-ipfs-keystore"
9
10 - config "github.com/ipfs/go-ipfs/config"
10 + config "github.com/ipfs/kubo/config"
11 ma "github.com/multiformats/go-multiaddr"
12 )
13
repo/repo.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 keystore "github.com/ipfs/go-ipfs-keystore"
10
11 ds "github.com/ipfs/go-datastore"
12 - config "github.com/ipfs/go-ipfs/config"
12 + config "github.com/ipfs/kubo/config"
13 ma "github.com/multiformats/go-multiaddr"
14 )
15
test/bench/bench_cli_ipfs_add/main.go
+2 -2
@@ -9,9 +9,9 @@ import (
9 "path"
10 "testing"
11
12 - "github.com/ipfs/go-ipfs/thirdparty/unit"
12 + "github.com/ipfs/kubo/thirdparty/unit"
13
14 - config "github.com/ipfs/go-ipfs/config"
14 + config "github.com/ipfs/kubo/config"
15 random "github.com/jbenet/go-random"
16 )
17
test/bench/offline_add/main.go
+2 -2
@@ -8,9 +8,9 @@ import (
8 "path"
9 "testing"
10
11 - "github.com/ipfs/go-ipfs/thirdparty/unit"
11 + "github.com/ipfs/kubo/thirdparty/unit"
12
13 - config "github.com/ipfs/go-ipfs/config"
13 + config "github.com/ipfs/kubo/config"
14 random "github.com/jbenet/go-random"
15 )
16
test/bin/Rules.mk
+14 -14
@@ -8,38 +8,38 @@ define go-build-testdep
8 $(GOCC) build $(go-flags-with-tags) -o "$${OUT}" "$<"
9 endef
10
11 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/pollEndpoint
12 -$(d)/pollEndpoint: github.com/ipfs/go-ipfs/test/dependencies/pollEndpoint
11 +.PHONY: github.com/ipfs/kubo/test/dependencies/pollEndpoint
12 +$(d)/pollEndpoint: github.com/ipfs/kubo/test/dependencies/pollEndpoint
13 $(go-build-testdep)
14 TGTS_$(d) += $(d)/pollEndpoint
15
16 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/go-sleep
17 -$(d)/go-sleep: github.com/ipfs/go-ipfs/test/dependencies/go-sleep
16 +.PHONY: github.com/ipfs/kubo/test/dependencies/go-sleep
17 +$(d)/go-sleep: github.com/ipfs/kubo/test/dependencies/go-sleep
18 $(go-build-testdep)
19 TGTS_$(d) += $(d)/go-sleep
20
21 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/graphsync-get
22 -$(d)/graphsync-get: github.com/ipfs/go-ipfs/test/dependencies/graphsync-get
21 +.PHONY: github.com/ipfs/kubo/test/dependencies/graphsync-get
22 +$(d)/graphsync-get: github.com/ipfs/kubo/test/dependencies/graphsync-get
23 $(go-build-testdep)
24 TGTS_$(d) += $(d)/graphsync-get
25
26 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/go-timeout
27 -$(d)/go-timeout: github.com/ipfs/go-ipfs/test/dependencies/go-timeout
26 +.PHONY: github.com/ipfs/kubo/test/dependencies/go-timeout
27 +$(d)/go-timeout: github.com/ipfs/kubo/test/dependencies/go-timeout
28 $(go-build-testdep)
29 TGTS_$(d) += $(d)/go-timeout
30
31 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/iptb
32 -$(d)/iptb: github.com/ipfs/go-ipfs/test/dependencies/iptb
31 +.PHONY: github.com/ipfs/kubo/test/dependencies/iptb
32 +$(d)/iptb: github.com/ipfs/kubo/test/dependencies/iptb
33 $(go-build-testdep)
34 TGTS_$(d) += $(d)/iptb
35
36 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/ma-pipe-unidir
37 -$(d)/ma-pipe-unidir: github.com/ipfs/go-ipfs/test/dependencies/ma-pipe-unidir
36 +.PHONY: github.com/ipfs/kubo/test/dependencies/ma-pipe-unidir
37 +$(d)/ma-pipe-unidir: github.com/ipfs/kubo/test/dependencies/ma-pipe-unidir
38 $(go-build-testdep)
39 TGTS_$(d) += $(d)/ma-pipe-unidir
40
41 -.PHONY: github.com/ipfs/go-ipfs/test/dependencies/json-to-junit
42 -$(d)/json-to-junit: github.com/ipfs/go-ipfs/test/dependencies/json-to-junit
41 +.PHONY: github.com/ipfs/kubo/test/dependencies/json-to-junit
42 +$(d)/json-to-junit: github.com/ipfs/kubo/test/dependencies/json-to-junit
43 $(go-build-testdep)
44 TGTS_$(d) += $(d)/json-to-junit
45
test/dependencies/go.mod
+1 -1
@@ -1,4 +1,4 @@
1 -module github.com/ipfs/go-ipfs/test/dependencies
1 +module github.com/ipfs/kubo/test/dependencies
2
3 go 1.17
4
test/integration/addcat_test.go
+5 -5
@@ -12,12 +12,12 @@ import (
12 "time"
13
14 files "github.com/ipfs/go-ipfs-files"
15 - "github.com/ipfs/go-ipfs/core"
16 - "github.com/ipfs/go-ipfs/core/bootstrap"
17 - "github.com/ipfs/go-ipfs/core/coreapi"
18 - mock "github.com/ipfs/go-ipfs/core/mock"
19 - "github.com/ipfs/go-ipfs/thirdparty/unit"
15 logging "github.com/ipfs/go-log"
16 + "github.com/ipfs/kubo/core"
17 + "github.com/ipfs/kubo/core/bootstrap"
18 + "github.com/ipfs/kubo/core/coreapi"
19 + mock "github.com/ipfs/kubo/core/mock"
20 + "github.com/ipfs/kubo/thirdparty/unit"
21 "github.com/jbenet/go-random"
22 "github.com/libp2p/go-libp2p-core/peer"
23 testutil "github.com/libp2p/go-libp2p-testing/net"
test/integration/bench_cat_test.go
+5 -5
@@ -9,11 +9,11 @@ import (
9 "testing"
10
11 files "github.com/ipfs/go-ipfs-files"
12 - "github.com/ipfs/go-ipfs/core"
13 - "github.com/ipfs/go-ipfs/core/bootstrap"
14 - "github.com/ipfs/go-ipfs/core/coreapi"
15 - mock "github.com/ipfs/go-ipfs/core/mock"
16 - "github.com/ipfs/go-ipfs/thirdparty/unit"
12 + "github.com/ipfs/kubo/core"
13 + "github.com/ipfs/kubo/core/bootstrap"
14 + "github.com/ipfs/kubo/core/coreapi"
15 + mock "github.com/ipfs/kubo/core/mock"
16 + "github.com/ipfs/kubo/thirdparty/unit"
17 "github.com/libp2p/go-libp2p-core/peer"
18 testutil "github.com/libp2p/go-libp2p-testing/net"
19 mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
test/integration/bench_test.go
+1 -1
@@ -3,7 +3,7 @@ package integrationtest
3 import (
4 "testing"
5
6 - "github.com/ipfs/go-ipfs/thirdparty/unit"
6 + "github.com/ipfs/kubo/thirdparty/unit"
7 testutil "github.com/libp2p/go-libp2p-testing/net"
8 )
9
test/integration/bitswap_wo_routing_test.go
+3 -3
@@ -7,9 +7,9 @@ import (
7
8 blocks "github.com/ipfs/go-block-format"
9 "github.com/ipfs/go-cid"
10 - "github.com/ipfs/go-ipfs/core"
11 - coremock "github.com/ipfs/go-ipfs/core/mock"
12 - "github.com/ipfs/go-ipfs/core/node/libp2p"
10 + "github.com/ipfs/kubo/core"
11 + coremock "github.com/ipfs/kubo/core/mock"
12 + "github.com/ipfs/kubo/core/node/libp2p"
13 mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
14 )
15
test/integration/three_legged_cat_test.go
+4 -4
@@ -9,10 +9,10 @@ import (
9 "testing"
10 "time"
11
12 - bootstrap2 "github.com/ipfs/go-ipfs/core/bootstrap"
13 - "github.com/ipfs/go-ipfs/core/coreapi"
14 - mock "github.com/ipfs/go-ipfs/core/mock"
15 - "github.com/ipfs/go-ipfs/thirdparty/unit"
12 + bootstrap2 "github.com/ipfs/kubo/core/bootstrap"
13 + "github.com/ipfs/kubo/core/coreapi"
14 + mock "github.com/ipfs/kubo/core/mock"
15 + "github.com/ipfs/kubo/thirdparty/unit"
16
17 files "github.com/ipfs/go-ipfs-files"
18 "github.com/libp2p/go-libp2p-core/peer"
test/integration/wan_lan_dht_test.go
+3 -3
@@ -11,9 +11,9 @@ import (
11 "time"
12
13 "github.com/ipfs/go-cid"
14 - "github.com/ipfs/go-ipfs/core"
15 - mock "github.com/ipfs/go-ipfs/core/mock"
16 - libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p"
14 + "github.com/ipfs/kubo/core"
15 + mock "github.com/ipfs/kubo/core/mock"
16 + libp2p2 "github.com/ipfs/kubo/core/node/libp2p"
17
18 corenet "github.com/libp2p/go-libp2p-core/network"
19 "github.com/libp2p/go-libp2p-core/peerstore"
test/sharness/t0280-plugin-data/example.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "fmt"
5 "os"
6
7 - "github.com/ipfs/go-ipfs/plugin"
7 + "github.com/ipfs/kubo/plugin"
8 )
9
10 var Plugins = []plugin.Plugin{
tracing/tracing.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "path"
8 "strings"
9
10 - version "github.com/ipfs/go-ipfs"
10 + version "github.com/ipfs/kubo"
11 "go.opentelemetry.io/otel"
12 "go.opentelemetry.io/otel/exporters/jaeger"
13 "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
version.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "fmt"
5 "runtime"
6
7 - "github.com/ipfs/go-ipfs/repo/fsrepo"
7 + "github.com/ipfs/kubo/repo/fsrepo"
8 )
9
10 // CurrentCommit is the current git commit, this is set as a ldflag in the Makefile