diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index b62fd601f..f2cd854c5 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -109,13 +109,13 @@ jobs:
run: cat output.md >> $GITHUB_STEP_SUMMARY
- name: Upload HTML report
if: failure() || success()
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: gateway-conformance.html
path: output.html
- name: Upload JSON report
if: failure() || success()
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: gateway-conformance.json
path: output.json
@@ -214,13 +214,13 @@ jobs:
run: cat output.md >> $GITHUB_STEP_SUMMARY
- name: Upload HTML report
if: failure() || success()
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: gateway-conformance-libp2p.html
path: output.html
- name: Upload JSON report
if: failure() || success()
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: gateway-conformance-libp2p.json
path: output.json
diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml
index 4e9e0b905..8165eb12a 100644
--- a/.github/workflows/gotest.yml
+++ b/.github/workflows/gotest.yml
@@ -14,11 +14,13 @@ concurrency:
cancel-in-progress: true
jobs:
- go-test:
+ # Unit tests with coverage collection (uploaded to Codecov)
+ unit-tests:
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
- timeout-minutes: 20
+ timeout-minutes: 15
env:
+ GOTRACEBACK: single # reduce noise on test timeout panics
TEST_DOCKER: 0
TEST_FUSE: 0
TEST_VERBOSE: 1
@@ -36,41 +38,18 @@ jobs:
go-version-file: 'go.mod'
- name: Install missing tools
run: sudo apt update && sudo apt install -y zsh
- - name: 👉️ If this step failed, go to «Summary» (top left) → inspect the «Failures/Errors» table
- env:
- # increasing parallelism beyond 2 doesn't speed up the tests much
- PARALLEL: 2
+ - name: Run unit tests
run: |
- make -j "$PARALLEL" test/unit/gotest.junit.xml &&
+ make test_unit &&
[[ ! $(jq -s -c 'map(select(.Action == "fail")) | .[]' test/unit/gotest.json) ]]
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+ uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
if: failure() || success()
with:
name: unittests
files: coverage/unit_tests.coverprofile
- - name: Test kubo-as-a-library example
- run: |
- # we want to first test with the kubo version in the go.mod file
- go test -v ./...
-
- # we also want to test the examples against the current version of kubo
- # however, that version might be in a fork so we need to replace the dependency
-
- # backup the go.mod and go.sum files to restore them after we run the tests
- cp go.mod go.mod.bak
- cp go.sum go.sum.bak
-
- # make sure the examples run against the current version of kubo
- go mod edit -replace github.com/ipfs/kubo=./../../..
- go mod tidy
-
- go test -v ./...
-
- # restore the go.mod and go.sum files to their original state
- mv go.mod.bak go.mod
- mv go.sum.bak go.sum
- working-directory: docs/examples/kubo-as-a-library
+ token: ${{ secrets.CODECOV_TOKEN }}
+ fail_ci_if_error: false
- name: Create a proper JUnit XML report
uses: ipdxco/gotest-json-to-junit-xml@v1
with:
@@ -78,9 +57,9 @@ jobs:
output: test/unit/gotest.junit.xml
if: failure() || success()
- name: Archive the JUnit XML report
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
- name: unit
+ name: unit-tests-junit
path: test/unit/gotest.junit.xml
if: failure() || success()
- name: Create a HTML report
@@ -91,9 +70,9 @@ jobs:
output: test/unit/gotest.html
if: failure() || success()
- name: Archive the HTML report
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
- name: html
+ name: unit-tests-html
path: test/unit/gotest.html
if: failure() || success()
- name: Create a Markdown report
@@ -106,3 +85,86 @@ jobs:
- name: Set the summary
run: cat test/unit/gotest.md >> $GITHUB_STEP_SUMMARY
if: failure() || success()
+
+ # End-to-end integration/regression tests from test/cli
+ # (Go-based replacement for legacy test/sharness shell scripts)
+ cli-tests:
+ if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
+ runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
+ timeout-minutes: 15
+ env:
+ GOTRACEBACK: single # reduce noise on test timeout panics
+ TEST_VERBOSE: 1
+ GIT_PAGER: cat
+ IPFS_CHECK_RCMGR_DEFAULTS: 1
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - name: Check out Kubo
+ uses: actions/checkout@v6
+ - name: Set up Go
+ uses: actions/setup-go@v6
+ with:
+ go-version-file: 'go.mod'
+ - name: Install missing tools
+ run: sudo apt update && sudo apt install -y zsh
+ - name: Run CLI tests
+ env:
+ IPFS_PATH: ${{ runner.temp }}/ipfs-test
+ run: make test_cli
+ - name: Create JUnit XML report
+ uses: ipdxco/gotest-json-to-junit-xml@v1
+ with:
+ input: test/cli/cli-tests.json
+ output: test/cli/cli-tests.junit.xml
+ if: failure() || success()
+ - name: Archive JUnit XML report
+ uses: actions/upload-artifact@v6
+ with:
+ name: cli-tests-junit
+ path: test/cli/cli-tests.junit.xml
+ if: failure() || success()
+ - name: Create HTML report
+ uses: ipdxco/junit-xml-to-html@v1
+ with:
+ mode: no-frames
+ input: test/cli/cli-tests.junit.xml
+ output: test/cli/cli-tests.html
+ if: failure() || success()
+ - name: Archive HTML report
+ uses: actions/upload-artifact@v6
+ with:
+ name: cli-tests-html
+ path: test/cli/cli-tests.html
+ if: failure() || success()
+ - name: Create Markdown report
+ uses: ipdxco/junit-xml-to-html@v1
+ with:
+ mode: summary
+ input: test/cli/cli-tests.junit.xml
+ output: test/cli/cli-tests.md
+ if: failure() || success()
+ - name: Set summary
+ run: cat test/cli/cli-tests.md >> $GITHUB_STEP_SUMMARY
+ if: failure() || success()
+
+ # Example tests (kubo-as-a-library)
+ example-tests:
+ if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
+ runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
+ timeout-minutes: 5
+ env:
+ GOTRACEBACK: single
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - name: Check out Kubo
+ uses: actions/checkout@v6
+ - name: Set up Go
+ uses: actions/setup-go@v6
+ with:
+ go-version-file: 'go.mod'
+ - name: Run example tests
+ run: make test_examples
diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
index d8b4eaad1..25bdba4f2 100644
--- a/.github/workflows/interop.yml
+++ b/.github/workflows/interop.yml
@@ -37,7 +37,7 @@ jobs:
with:
go-version-file: 'go.mod'
- run: make build
- - uses: actions/upload-artifact@v5
+ - uses: actions/upload-artifact@v6
with:
name: kubo
path: cmd/ipfs/ipfs
diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
index 94fdf8008..ac32bf3a4 100644
--- a/.github/workflows/sharness.yml
+++ b/.github/workflows/sharness.yml
@@ -55,11 +55,13 @@ jobs:
# increasing parallelism beyond 10 doesn't speed up the tests much
PARALLEL: ${{ github.repository == 'ipfs/kubo' && 10 || 3 }}
- name: Upload coverage report
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+ uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
if: failure() || success()
with:
name: sharness
files: kubo/coverage/sharness_tests.coverprofile
+ token: ${{ secrets.CODECOV_TOKEN }}
+ fail_ci_if_error: false
- name: Aggregate results
run: find kubo/test/sharness/test-results -name 't*-*.sh.*.counts' | kubo/test/sharness/lib/sharness/aggregate-results.sh > kubo/test/sharness/test-results/summary.txt
- name: 👉️ If this step failed, go to «Summary» (top left) → «HTML Report» → inspect the «Failures» column
@@ -88,7 +90,7 @@ jobs:
destination: sharness.html
- name: Upload one-page HTML report
if: github.repository != 'ipfs/kubo' && (failure() || success())
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: sharness.html
path: kubo/test/sharness/test-results/sharness.html
@@ -108,7 +110,7 @@ jobs:
destination: sharness-html/
- name: Upload full HTML report
if: github.repository != 'ipfs/kubo' && (failure() || success())
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: sharness-html
path: kubo/test/sharness/test-results/sharness-html
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 0d30bd357..35fcbe729 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -77,7 +77,7 @@ jobs:
- name: Upload test results
if: always()
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v6
with:
name: ${{ matrix.os }}-test-results
path: |
diff --git a/.gitignore b/.gitignore
index cb147456b..890870a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,11 @@ go-ipfs-source.tar.gz
docs/examples/go-ipfs-as-a-library/example-folder/Qm*
/test/sharness/t0054-dag-car-import-export-data/*.car
+# test artifacts from make test_unit / test_cli
+/test/unit/gotest.json
+/test/unit/gotest.junit.xml
+/test/cli/cli-tests.json
+
# ignore build output from snapcraft
/ipfs_*.snap
/parts
diff --git a/README.md b/README.md
index fa8285253..c1eaf9748 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
- Kubo: IPFS Implementation in GO
+ Kubo: IPFS Implementation in Go
@@ -11,106 +11,61 @@
- 
+
+
+What is Kubo? | Quick Taste | Install | Documentation | Development | Getting Help
+
+
## What is Kubo?
-Kubo was the first IPFS implementation and is the most widely used one today. Implementing the *Interplanetary Filesystem* - the standard for content-addressing on the Web, interoperable with HTTP. Thus powered by future-proof data models and the libp2p for network communication. Kubo is written in Go.
+Kubo was the first [IPFS](https://docs.ipfs.tech/concepts/what-is-ipfs/) implementation and is the [most widely used one today](https://probelab.io/ipfs/topology/#chart-agent-types-avg). It takes an opinionated approach to content-addressing ([CIDs](https://docs.ipfs.tech/concepts/glossary/#cid), [DAGs](https://docs.ipfs.tech/concepts/glossary/#dag)) that maximizes interoperability: [UnixFS](https://docs.ipfs.tech/concepts/glossary/#unixfs) for files and directories, [HTTP Gateways](https://docs.ipfs.tech/concepts/glossary/#gateway) for web browsers, [Bitswap](https://docs.ipfs.tech/concepts/glossary/#bitswap) and [HTTP](https://specs.ipfs.tech/http-gateways/trustless-gateway/) for verifiable data transfer.
-Featureset
-- Runs an IPFS-Node as a network service that is part of LAN and WAN DHT
-- Native support for UnixFS (most popular way to represent files and directories on IPFS)
-- [HTTP Gateway](https://specs.ipfs.tech/http-gateways/) (`/ipfs` and `/ipns`) functionality for trusted and [trustless](https://docs.ipfs.tech/reference/http/gateway/#trustless-verifiable-retrieval) content retrieval
-- [HTTP Routing V1](https://specs.ipfs.tech/routing/http-routing-v1/) (`/routing/v1`) client and server implementation for [delegated routing](./docs/delegated-routing.md) lookups
-- [HTTP Kubo RPC API](https://docs.ipfs.tech/reference/kubo/rpc/) (`/api/v0`) to access and control the daemon
-- [Command Line Interface](https://docs.ipfs.tech/reference/kubo/cli/) based on (`/api/v0`) RPC API
-- [WebUI](https://github.com/ipfs/ipfs-webui/#readme) to manage the Kubo node
-- [Content blocking](/docs/content-blocking.md) support for operators of public nodes
+**Features:**
-### Other implementations
+- Runs an IPFS node as a network service (LAN [mDNS](https://github.com/libp2p/specs/blob/master/discovery/mdns.md) and WAN [Amino DHT](https://docs.ipfs.tech/concepts/glossary/#dht))
+- [Command-line interface](https://docs.ipfs.tech/reference/kubo/cli/) (`ipfs --help`)
+- [WebUI](https://github.com/ipfs/ipfs-webui/#readme) for node management
+- [HTTP Gateway](https://specs.ipfs.tech/http-gateways/) for trusted and [trustless](https://docs.ipfs.tech/reference/http/gateway/#trustless-verifiable-retrieval) content retrieval
+- [HTTP RPC API](https://docs.ipfs.tech/reference/kubo/rpc/) to control the daemon
+- [HTTP Routing V1](https://specs.ipfs.tech/routing/http-routing-v1/) client and server for [delegated routing](./docs/delegated-routing.md)
+- [Content blocking](./docs/content-blocking.md) for public node operators
-See [List](https://docs.ipfs.tech/basics/ipfs-implementations/)
+**Other IPFS implementations:** [Helia](https://github.com/ipfs/helia) (JavaScript), [more...](https://docs.ipfs.tech/concepts/ipfs-implementations/)
-## What is IPFS?
+## Quick Taste
-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.
+After [installing Kubo](#install), verify it works:
-For more info see: https://docs.ipfs.tech/concepts/what-is-ipfs/
+```console
+$ ipfs init
+generating ED25519 keypair...done
+peer identity: 12D3KooWGcSLQdLDBi2BvoP8WnpdHvhWPbxpGcqkf93rL2XMZK7R
-Before opening an issue, consider using one of the following locations to ensure you are opening your thread in the right place:
- - kubo (previously named go-ipfs) _implementation_ bugs in [this repo](https://github.com/ipfs/kubo/issues).
- - Documentation issues in [ipfs/docs issues](https://github.com/ipfs/ipfs-docs/issues).
- - IPFS _design_ in [ipfs/specs issues](https://github.com/ipfs/specs/issues).
- - Exploration of new ideas in [ipfs/notes issues](https://github.com/ipfs/notes/issues).
- - Ask questions and meet the rest of the community at the [IPFS Forum](https://discuss.ipfs.tech).
- - Or [chat with us](https://docs.ipfs.tech/community/chat/).
+$ ipfs daemon &
+Daemon is ready
-[](https://www.youtube.com/channel/UCdjsUXJ3QawK4O5L1kqqsew) [](https://twitter.com/IPFS)
+$ echo "hello IPFS" | ipfs add -q --cid-version 1
+bafkreicouv3sksjuzxb3rbb6rziy6duakk2aikegsmtqtz5rsuppjorxsa
-## Next milestones
+$ ipfs cat bafkreicouv3sksjuzxb3rbb6rziy6duakk2aikegsmtqtz5rsuppjorxsa
+hello IPFS
+```
-[Milestones on GitHub](https://github.com/ipfs/kubo/milestones)
+Verify this CID is provided by your node to the IPFS network:
-
-## Table of Contents
-
-- [What is Kubo?](#what-is-kubo)
-- [What is IPFS?](#what-is-ipfs)
-- [Next milestones](#next-milestones)
-- [Table of Contents](#table-of-contents)
-- [Security Issues](#security-issues)
-- [Install](#install)
- - [Minimal System Requirements](#minimal-system-requirements)
- - [Docker](#docker)
- - [Official prebuilt binaries](#official-prebuilt-binaries)
- - [Updating](#updating)
- - [Downloading builds using IPFS](#downloading-builds-using-ipfs)
- - [Unofficial Linux packages](#unofficial-linux-packages)
- - [ArchLinux](#arch-linux)
- - [Gentoo Linux](#gentoo-linux)
- - [Nix](#nix)
- - [Solus](#solus)
- - [openSUSE](#opensuse)
- - [Guix](#guix)
- - [Snap](#snap)
- - [Ubuntu PPA](#ubuntu-ppa)
- - [Fedora](#fedora-copr)
- - [Unofficial Windows packages](#unofficial-windows-packages)
- - [Chocolatey](#chocolatey)
- - [Scoop](#scoop)
- - [Unofficial MacOS packages](#unofficial-macos-packages)
- - [MacPorts](#macports)
- - [Nix](#nix-macos)
- - [Homebrew](#homebrew)
- - [Build from Source](#build-from-source)
- - [Install Go](#install-go)
- - [Download and Compile IPFS](#download-and-compile-ipfs)
- - [Cross Compiling](#cross-compiling)
- - [Troubleshooting](#troubleshooting)
-- [Getting Started](#getting-started)
- - [Usage](#usage)
- - [Some things to try](#some-things-to-try)
- - [Troubleshooting](#troubleshooting-1)
-- [Packages](#packages)
-- [Development](#development)
-- [Maintainer Info](#maintainer-info)
-- [Contributing](#contributing)
-- [License](#license)
-
-## Security Issues
-
-Please follow [`SECURITY.md`](SECURITY.md).
+See `ipfs add --help` for all import options. Ready for more? Follow the [command-line quick start](https://docs.ipfs.tech/how-to/command-line-quick-start/).
## Install
-The canonical download instructions for IPFS are over at: https://docs.ipfs.tech/install/. It is **highly recommended** you follow those instructions if you are not interested in working on IPFS development.
+Follow the [official installation guide](https://docs.ipfs.tech/install/command-line/), or choose: [prebuilt binary](#official-prebuilt-binaries) | [Docker](#docker) | [package manager](#package-managers) | [from source](#build-from-source).
-For production use, Release Docker images (below) are recommended.
+Prefer a GUI? Try [IPFS Desktop](https://docs.ipfs.tech/install/ipfs-desktop/) and/or [IPFS Companion](https://docs.ipfs.tech/install/ipfs-companion/).
### Minimal System Requirements
@@ -122,354 +77,148 @@ Kubo runs on most Linux, macOS, and Windows systems. For optimal performance, we
> [!CAUTION]
> Systems with less than the recommended memory may experience instability, frequent OOM errors or restarts, and missing data announcement (reprovider window), which can make data fully or partially inaccessible to other peers. Running Kubo on underprovisioned hardware is at your own risk.
+### Official Prebuilt Binaries
+
+Download from https://dist.ipfs.tech#kubo or [GitHub Releases](https://github.com/ipfs/kubo/releases/latest).
+
### Docker
Official images are published at https://hub.docker.com/r/ipfs/kubo/: [](https://hub.docker.com/r/ipfs/kubo/)
#### 🟢 Release Images
- - These are production grade images. Use them.
- - `latest` and [`release`](https://hub.docker.com/r/ipfs/kubo/tags?name=release) tags always point at [the latest stable release](https://github.com/ipfs/kubo/releases/latest). If you use this, remember to `docker pull` periodically to update.
- - [`vN.N.N`](https://hub.docker.com/r/ipfs/kubo/tags?name=v) points at a specific [release tag](https://github.com/ipfs/kubo/releases)
-#### 🟠 Developer Preview Images
- - These tags are used by developers for internal testing, not intended for end users or production use.
- - [`master-latest`](https://hub.docker.com/r/ipfs/kubo/tags?name=master-latest) always points at the `HEAD` of the [`master`](https://github.com/ipfs/kubo/commits/master/) branch
- - [`master-YYYY-DD-MM-GITSHA`](https://hub.docker.com/r/ipfs/kubo/tags?name=master-2) points at a specific commit from the `master` branch
+Use these for production deployments.
-#### 🔴 Internal Staging Images
- - We use `staging` for testing arbitrary commits and experimental patches.
- - To build image for current HEAD, force push to `staging` via `git push origin HEAD:staging --force`)
- - [`staging-latest`](https://hub.docker.com/r/ipfs/kubo/tags?name=staging-latest) always points at the `HEAD` of the [`staging`](https://github.com/ipfs/kubo/commits/staging/) branch
- - [`staging-YYYY-DD-MM-GITSHA`](https://hub.docker.com/r/ipfs/kubo/tags?name=staging-2) points at a specific commit from the `staging` branch
+- `latest` and [`release`](https://hub.docker.com/r/ipfs/kubo/tags?name=release) always point at [the latest stable release](https://github.com/ipfs/kubo/releases/latest)
+- [`vN.N.N`](https://hub.docker.com/r/ipfs/kubo/tags?name=v) points at a specific [release tag](https://github.com/ipfs/kubo/releases)
```console
$ docker pull ipfs/kubo:latest
$ docker run --rm -it --net=host ipfs/kubo:latest
```
-To [customize your node](https://docs.ipfs.tech/install/run-ipfs-inside-docker/#customizing-your-node),
-pass necessary config via `-e` or by mounting scripts in the `/container-init.d`.
+To [customize your node](https://docs.ipfs.tech/install/run-ipfs-inside-docker/#customizing-your-node), pass config via `-e` or mount scripts in `/container-init.d`.
-Learn more at https://docs.ipfs.tech/install/run-ipfs-inside-docker/
+#### 🟠 Developer Preview Images
-### Official prebuilt binaries
+For internal testing, not intended for production.
-The official binaries are published at https://dist.ipfs.tech#kubo:
+- [`master-latest`](https://hub.docker.com/r/ipfs/kubo/tags?name=master-latest) points at `HEAD` of [`master`](https://github.com/ipfs/kubo/commits/master/)
+- [`master-YYYY-DD-MM-GITSHA`](https://hub.docker.com/r/ipfs/kubo/tags?name=master-2) points at a specific commit
-[](https://dist.ipfs.tech#kubo)
+#### 🔴 Internal Staging Images
-From there:
-- Click the blue "Download Kubo" on the right side of the page.
-- Open/extract the archive.
-- Move kubo (`ipfs`) to your path (`install.sh` can do it for you).
+For testing arbitrary commits and experimental patches (force push to `staging` branch).
-If you are unable to access [dist.ipfs.tech](https://dist.ipfs.tech#kubo), you can also download kubo from:
-- this project's GitHub [releases](https://github.com/ipfs/kubo/releases/latest) page
-- `/ipns/dist.ipfs.tech` at [dweb.link](https://dweb.link/ipns/dist.ipfs.tech#kubo) gateway
-
-#### Updating
-
-##### Downloading builds using IPFS
-
-List the available versions of Kubo implementation:
-
-```console
-$ ipfs cat /ipns/dist.ipfs.tech/kubo/versions
-```
-
-Then, to view available builds for a version from the previous command (`$VERSION`):
-
-```console
-$ ipfs ls /ipns/dist.ipfs.tech/kubo/$VERSION
-```
-
-To download a given build of a version:
-
-```console
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_darwin-amd64.tar.gz # darwin amd64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_darwin-arm64.tar.gz # darwin arm64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_freebsd-amd64.tar.gz # freebsd amd64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_linux-amd64.tar.gz # linux amd64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_linux-riscv64.tar.gz # linux riscv64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_linux-arm64.tar.gz # linux arm64 build
-$ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_windows-amd64.zip # windows amd64 build
-```
-
-### Unofficial Linux packages
-
-
- 
-
-
-- [ArchLinux](#arch-linux)
-- [Gentoo Linux](#gentoo-linux)
-- [Nix](#nix-linux)
-- [Solus](#solus)
-- [openSUSE](#opensuse)
-- [Guix](#guix)
-- [Snap](#snap)
-- [Ubuntu PPA](#ubuntu-ppa)
-- [Fedora](#fedora-copr)
-
-#### Arch Linux
-
-[](https://wiki.archlinux.org/title/IPFS)
-
-```bash
-# pacman -S kubo
-```
-
-[](https://archlinux.org/packages/kubo/)
-
-#### Gentoo Linux
-
-https://wiki.gentoo.org/wiki/Kubo
-
-```bash
-# emerge -a net-p2p/kubo
-```
-
-https://packages.gentoo.org/packages/net-p2p/kubo
-
-#### Nix
-
-With the purely functional package manager [Nix](https://nixos.org/nix/) you can install kubo like this:
-
-```
-$ nix-env -i kubo
-```
-
-You can also install the Package by using its attribute name, which is also `kubo`.
-
-#### Solus
-
-[Package for Solus](https://dev.getsol.us/source/kubo/repository/master/)
-
-```
-$ sudo eopkg install kubo
-```
-
-You can also install it through the Solus software center.
-
-#### openSUSE
-
-[Community Package for kubo](https://software.opensuse.org/package/kubo)
-
-#### Guix
-
-[Community Package for kubo](https://packages.guix.gnu.org/search/?query=kubo) is available.
-
-#### Snap
-
-No longer supported, see rationale in [kubo#8688](https://github.com/ipfs/kubo/issues/8688).
-
-#### Ubuntu PPA
-
-[PPA homepage](https://launchpad.net/~twdragon/+archive/ubuntu/ipfs) on Launchpad.
-
-##### Latest Ubuntu (>= 20.04 LTS)
-```sh
-sudo add-apt-repository ppa:twdragon/ipfs
-sudo apt update
-sudo apt install ipfs-kubo
-```
-
-### Fedora COPR
-
-[`taw00/ipfs-rpm`](https://github.com/taw00/ipfs-rpm)
-
-##### Any Ubuntu version
-
-```sh
-sudo su
-echo 'deb https://ppa.launchpadcontent.net/twdragon/ipfs/ubuntu <> main' >> /etc/apt/sources.list.d/ipfs
-echo 'deb-src https://ppa.launchpadcontent.net/twdragon/ipfs/ubuntu <> main' >> /etc/apt/sources.list.d/ipfs
-exit
-sudo apt update
-sudo apt install ipfs-kubo
-```
-where `<>` is the codename of your Ubuntu distribution (for example, `jammy` for 22.04 LTS). During the first installation the package maintenance script may automatically ask you about which networking profile, CPU accounting model, and/or existing node configuration file you want to use.
-
-**NOTE**: this method also may work with any compatible Debian-based distro which has `libc6` inside, and APT as a package manager.
-
-### Unofficial Windows packages
-
-- [Chocolatey](#chocolatey)
-- [Scoop](#scoop)
-
-#### Chocolatey
-
-No longer supported, see rationale in [kubo#9341](https://github.com/ipfs/kubo/issues/9341).
-
-#### Scoop
-
-Scoop provides kubo as `kubo` in its 'extras' bucket.
-
-```Powershell
-PS> scoop bucket add extras
-PS> scoop install kubo
-```
-
-### Unofficial macOS packages
-
-- [MacPorts](#macports)
-- [Nix](#nix-macos)
-- [Homebrew](#homebrew)
-
-#### MacPorts
-
-The package [ipfs](https://ports.macports.org/port/ipfs) currently points to kubo and is being maintained.
-
-```
-$ sudo port install ipfs
-```
-
-#### Nix
-
-In macOS you can use the purely functional package manager [Nix](https://nixos.org/nix/):
-
-```
-$ nix-env -i kubo
-```
-
-You can also install the Package by using its attribute name, which is also `kubo`.
-
-#### Homebrew
-
-A Homebrew formula [ipfs](https://formulae.brew.sh/formula/ipfs) is maintained too.
-
-```
-$ brew install --formula ipfs
-```
+- [`staging-latest`](https://hub.docker.com/r/ipfs/kubo/tags?name=staging-latest) points at `HEAD` of [`staging`](https://github.com/ipfs/kubo/commits/staging/)
+- [`staging-YYYY-DD-MM-GITSHA`](https://hub.docker.com/r/ipfs/kubo/tags?name=staging-2) points at a specific commit
### Build from Source
-kubo's build system requires Go and some standard POSIX build tools:
-
-* GNU make
-* Git
-* GCC (or some other go compatible C Compiler) (optional)
-
-To build without GCC, build with `CGO_ENABLED=0` (e.g., `make build CGO_ENABLED=0`).
-
-#### Install Go
-
-
-
-If you need to update: [Download latest version of Go](https://golang.org/dl/).
-
-You'll need to add Go's bin directories to your `$PATH` environment variable e.g., by adding these lines to your `/etc/profile` (for a system-wide installation) or `$HOME/.profile`:
-
-```
-export PATH=$PATH:/usr/local/go/bin
-export PATH=$PATH:$GOPATH/bin
+```bash
+git clone https://github.com/ipfs/kubo.git
+cd kubo
+make build # creates cmd/ipfs/ipfs
+make install # installs to $GOPATH/bin/ipfs
```
-(If you run into trouble, see the [Go install instructions](https://golang.org/doc/install)).
+See the [Developer Guide](docs/developer-guide.md) for details, Windows instructions, and troubleshooting.
-#### Download and Compile IPFS
+### Package Managers
-```
-$ git clone https://github.com/ipfs/kubo.git
+Kubo is available in community-maintained packages across many operating systems, Linux distributions, and package managers. See [Repology](https://repology.org/project/kubo/versions) for the full list: [](https://repology.org/project/kubo/versions)
-$ cd kubo
-$ make install
-```
+> [!WARNING]
+> These packages are maintained by third-party volunteers. The IPFS Project and Kubo maintainers are not responsible for their contents or supply chain security. For increased security, [build from source](#build-from-source).
-Alternatively, you can run `make build` to build the kubo binary (storing it in `cmd/ipfs/ipfs`) without installing it.
+#### Linux
-**NOTE:** If you get an error along the lines of "fatal error: stdlib.h: No such file or directory", you're missing a C compiler. Either re-run `make` with `CGO_ENABLED=0` or install GCC.
+| Distribution | Install | Version |
+|--------------|---------|---------|
+| Ubuntu | [PPA](https://launchpad.net/~twdragon/+archive/ubuntu/ipfs): `sudo apt install ipfs-kubo` | [](https://launchpad.net/~twdragon/+archive/ubuntu/ipfs) |
+| Arch | `pacman -S kubo` | [](https://archlinux.org/packages/extra/x86_64/kubo/) |
+| Fedora | [COPR](https://copr.fedorainfracloud.org/coprs/taw/ipfs/): `dnf install kubo` | [](https://copr.fedorainfracloud.org/coprs/taw/ipfs/) |
+| Nix | `nix-env -i kubo` | [](https://search.nixos.org/packages?query=kubo) |
+| Gentoo | `emerge -a net-p2p/kubo` | [](https://packages.gentoo.org/packages/net-p2p/kubo) |
+| openSUSE | `zypper install kubo` | [](https://software.opensuse.org/package/kubo) |
+| Solus | `sudo eopkg install kubo` | [](https://packages.getsol.us/shannon/k/kubo/) |
+| Guix | `guix install kubo` | [](https://packages.guix.gnu.org/packages/kubo/) |
+| _other_ | [See Repology for the full list](https://repology.org/project/kubo/versions) | |
-##### Cross Compiling
+~~Snap~~ no longer supported ([#8688](https://github.com/ipfs/kubo/issues/8688))
-Compiling for a different platform is as simple as running:
+#### macOS
-```
-make build GOOS=myTargetOS GOARCH=myTargetArchitecture
-```
+| Manager | Install | Version |
+|---------|---------|---------|
+| Homebrew | `brew install ipfs` | [](https://formulae.brew.sh/formula/ipfs) |
+| MacPorts | `sudo port install ipfs` | [](https://ports.macports.org/port/ipfs/) |
+| Nix | `nix-env -i kubo` | [](https://search.nixos.org/packages?query=kubo) |
+| _other_ | [See Repology for the full list](https://repology.org/project/kubo/versions) | |
-#### Troubleshooting
+#### Windows
-- Separate [instructions are available for building on Windows](docs/windows.md).
-- `git` is required in order for `go get` to fetch all dependencies.
-- Package managers often contain out-of-date `golang` packages.
- Ensure that `go version` reports the minimum version required (see go.mod). See above for how to install go.
-- If you are interested in development, please install the development
-dependencies as well.
-- Shell command completions can be generated with one of the `ipfs commands completion` subcommands. Read [docs/command-completion.md](docs/command-completion.md) to learn more.
-- See the [misc folder](https://github.com/ipfs/kubo/tree/master/misc) for how to connect IPFS to systemd or whatever init system your distro uses.
+| Manager | Install | Version |
+|---------|---------|---------|
+| Scoop | `scoop install kubo` | [](https://scoop.sh/#/apps?q=kubo) |
+| _other_ | [See Repology for the full list](https://repology.org/project/kubo/versions) | |
-## Getting Started
+~~Chocolatey~~ no longer supported ([#9341](https://github.com/ipfs/kubo/issues/9341))
-### Usage
+## Documentation
-[](https://docs.ipfs.tech/how-to/command-line-quick-start/)
-[](https://docs.ipfs.tech/reference/kubo/cli/)
-
-To start using IPFS, you must first initialize IPFS's config files on your
-system, this is done with `ipfs init`. See `ipfs init --help` for information on
-the optional arguments it takes. After initialization is complete, you can use
-`ipfs mount`, `ipfs add` and any of the other commands to explore!
-
-For detailed configuration options, see [docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md).
-
-### Some things to try
-
-Basic proof of 'ipfs working' locally:
-
- echo "hello world" > hello
- ipfs add hello
- # This should output a hash string that looks something like:
- # QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o
- ipfs cat
-
-### HTTP/RPC clients
-
-For programmatic interaction with Kubo, see our [list of HTTP/RPC clients](docs/http-rpc-clients.md).
-
-### Troubleshooting
-
-If you have previously installed IPFS before and you are running into problems getting a newer version to work, try deleting (or backing up somewhere else) your IPFS config directory (~/.ipfs by default) and rerunning `ipfs init`. This will reinitialize the config file to its defaults and clear out the local datastore of any bad entries.
-
-For more information about configuration options, see [docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md).
-
-Please direct general questions and help requests to our [forums](https://discuss.ipfs.tech).
-
-If you believe you've found a bug, check the [issues list](https://github.com/ipfs/kubo/issues) and, if you don't see your problem there, either come talk to us on [Matrix chat](https://docs.ipfs.tech/community/chat/), or file an issue of your own!
-
-## Packages
-
-See [IPFS in GO](https://docs.ipfs.tech/reference/go/api/) documentation.
+| Topic | Description |
+|-------|-------------|
+| [Configuration](docs/config.md) | All config options reference |
+| [Environment variables](docs/environment-variables.md) | Runtime settings via env vars |
+| [Experimental features](docs/experimental-features.md) | Opt-in features in development |
+| [HTTP Gateway](docs/gateway.md) | Path, subdomain, and trustless gateway setup |
+| [HTTP RPC clients](docs/http-rpc-clients.md) | Client libraries for Go, JS |
+| [Delegated routing](docs/delegated-routing.md) | Multi-router and HTTP routing |
+| [Metrics & monitoring](docs/metrics.md) | Prometheus metrics |
+| [Content blocking](docs/content-blocking.md) | Denylist for public nodes |
+| [Customizing](docs/customizing.md) | Unsure if use Plugins, Boxo, or fork? |
+| [Debug guide](docs/debug-guide.md) | CPU profiles, memory analysis, tracing |
+| [Changelogs](docs/changelogs/) | Release notes for each version |
+| [All documentation](https://github.com/ipfs/kubo/tree/master/docs) | Full list of docs |
## Development
-See the [Developer Guide](docs/developer-guide.md) for build instructions, testing, architecture, and contribution workflow.
+See the [Developer Guide](docs/developer-guide.md) for build instructions, testing, and contribution workflow.
-## Maintainer Info
+## Getting Help
-Kubo is maintained by [Shipyard](https://ipshipyard.com/).
+- [IPFS Forum](https://discuss.ipfs.tech) - community support, questions, and discussion
+- [Community](https://docs.ipfs.tech/community/) - chat, events, and working groups
+- [GitHub Issues](https://github.com/ipfs/kubo/issues) - bug reports for Kubo specifically
+- [IPFS Docs Issues](https://github.com/ipfs/ipfs-docs/issues) - documentation issues
-* This repository is part of [Shipyard's GO Triage triage](https://ipshipyard.notion.site/IPFS-Go-Triage-Boxo-Kubo-Rainbow-0ddee6b7f28d412da7dabe4f9107c29a).
-* [Release Process](https://ipshipyard.notion.site/Kubo-Release-Process-6dba4f5755c9458ab5685eeb28173778)
+## Security Issues
+See [`SECURITY.md`](SECURITY.md).
## Contributing
[](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md)
-We ❤️ all [our contributors](docs/AUTHORS); this project wouldn’t be what it is without you! If you want to help out, please see [CONTRIBUTING.md](CONTRIBUTING.md).
+We welcome contributions. See [CONTRIBUTING.md](CONTRIBUTING.md) and the [Developer Guide](docs/developer-guide.md).
-This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
+This repository follows the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
-Members of IPFS community provide Kubo support on [discussion forum category here](https://discuss.ipfs.tech/c/help/help-kubo/23).
+## Maintainer Info
-Need help with IPFS itself? Learn where to get help and support at https://ipfs.tech/help.
+
+
+> [!NOTE]
+> Kubo is maintained by the [Shipyard](https://ipshipyard.com/) team.
+>
+> [Release Process](https://ipshipyard.notion.site/Kubo-Release-Process-6dba4f5755c9458ab5685eeb28173778)
## License
-This project is dual-licensed under Apache 2.0 and MIT terms:
+Dual-licensed under Apache 2.0 and MIT:
-- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/ipfs/kubo/blob/master/LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](https://github.com/ipfs/kubo/blob/master/LICENSE-MIT) or http://opensource.org/licenses/MIT)
+- [LICENSE-APACHE](LICENSE-APACHE)
+- [LICENSE-MIT](LICENSE-MIT)
diff --git a/Rules.mk b/Rules.mk
index d8f16ada8..b04e3d73e 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -134,15 +134,14 @@ help:
@echo ''
@echo 'TESTING TARGETS:'
@echo ''
- @echo ' test - Run all tests'
- @echo ' test_short - Run short go tests and short sharness tests'
- @echo ' test_go_short - Run short go tests'
- @echo ' test_go_test - Run all go tests'
+ @echo ' test - Run all tests (test_go_fmt, test_unit, test_cli, test_sharness)'
+ @echo ' test_short - Run fast tests (test_go_fmt, test_unit)'
+ @echo ' test_unit - Run unit tests with coverage (excludes test/cli)'
+ @echo ' test_cli - Run CLI integration tests (requires built binary)'
+ @echo ' test_go_fmt - Check Go source formatting'
@echo ' test_go_build - Build kubo for all platforms from .github/build-platforms.yml'
- @echo ' test_go_expensive - Run all go tests and build all platforms'
- @echo ' test_go_race - Run go tests with the race detector enabled'
- @echo ' test_go_lint - Run the `golangci-lint` vetting tool'
+ @echo ' test_go_lint - Run golangci-lint'
@echo ' test_sharness - Run sharness tests'
- @echo ' coverage - Collects coverage info from unit tests and sharness'
+ @echo ' coverage - Collect coverage info from unit tests and sharness'
@echo
.PHONY: help
diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go
index a11dd13e4..d5b06176a 100644
--- a/core/coreunix/add_test.go
+++ b/core/coreunix/add_test.go
@@ -30,6 +30,7 @@ import (
const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
func TestAddMultipleGCLive(t *testing.T) {
+ ctx := t.Context()
r := &repo.Mock{
C: config.Config{
Identity: config.Identity{
@@ -38,13 +39,13 @@ func TestAddMultipleGCLive(t *testing.T) {
},
D: syncds.MutexWrap(datastore.NewMapDatastore()),
}
- node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
+ node, err := core.NewNode(ctx, &core.BuildCfg{Repo: r})
if err != nil {
t.Fatal(err)
}
out := make(chan interface{}, 10)
- adder, err := NewAdder(context.Background(), node.Pinning, node.Blockstore, node.DAG)
+ adder, err := NewAdder(ctx, node.Pinning, node.Blockstore, node.DAG)
if err != nil {
t.Fatal(err)
}
@@ -67,7 +68,7 @@ func TestAddMultipleGCLive(t *testing.T) {
go func() {
defer close(out)
- _, _ = adder.AddAllAndPin(context.Background(), slf)
+ _, _ = adder.AddAllAndPin(ctx, slf)
// Ignore errors for clarity - the real bug would be gc'ing files while adding them, not this resultant error
}()
@@ -80,9 +81,12 @@ func TestAddMultipleGCLive(t *testing.T) {
gc1started := make(chan struct{})
go func() {
defer close(gc1started)
- gc1out = gc.GC(context.Background(), node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
+ gc1out = gc.GC(ctx, node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
}()
+ // Give GC goroutine time to reach GCLock (will block there waiting for adder)
+ time.Sleep(time.Millisecond * 100)
+
// GC shouldn't get the lock until after the file is completely added
select {
case <-gc1started:
@@ -119,9 +123,12 @@ func TestAddMultipleGCLive(t *testing.T) {
gc2started := make(chan struct{})
go func() {
defer close(gc2started)
- gc2out = gc.GC(context.Background(), node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
+ gc2out = gc.GC(ctx, node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
}()
+ // Give GC goroutine time to reach GCLock
+ time.Sleep(time.Millisecond * 100)
+
select {
case <-gc2started:
t.Fatal("gc shouldn't have started yet")
@@ -155,6 +162,7 @@ func TestAddMultipleGCLive(t *testing.T) {
}
func TestAddGCLive(t *testing.T) {
+ ctx := t.Context()
r := &repo.Mock{
C: config.Config{
Identity: config.Identity{
@@ -163,13 +171,13 @@ func TestAddGCLive(t *testing.T) {
},
D: syncds.MutexWrap(datastore.NewMapDatastore()),
}
- node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
+ node, err := core.NewNode(ctx, &core.BuildCfg{Repo: r})
if err != nil {
t.Fatal(err)
}
out := make(chan interface{})
- adder, err := NewAdder(context.Background(), node.Pinning, node.Blockstore, node.DAG)
+ adder, err := NewAdder(ctx, node.Pinning, node.Blockstore, node.DAG)
if err != nil {
t.Fatal(err)
}
@@ -193,7 +201,7 @@ func TestAddGCLive(t *testing.T) {
go func() {
defer close(addDone)
defer close(out)
- _, err := adder.AddAllAndPin(context.Background(), slf)
+ _, err := adder.AddAllAndPin(ctx, slf)
if err != nil {
t.Error(err)
}
@@ -211,7 +219,7 @@ func TestAddGCLive(t *testing.T) {
gcstarted := make(chan struct{})
go func() {
defer close(gcstarted)
- gcout = gc.GC(context.Background(), node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
+ gcout = gc.GC(ctx, node.Blockstore, node.Repo.Datastore(), node.Pinning, nil)
}()
// gc shouldn't start until we let the add finish its current file.
@@ -255,9 +263,6 @@ func TestAddGCLive(t *testing.T) {
last = c
}
- ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
- defer cancel()
-
set := cid.NewSet()
err = dag.Walk(ctx, dag.GetLinksWithDAG(node.DAG), last, set.Visit)
if err != nil {
diff --git a/core/node/libp2p/rcmgr.go b/core/node/libp2p/rcmgr.go
index 91a19bc2e..6844757f9 100644
--- a/core/node/libp2p/rcmgr.go
+++ b/core/node/libp2p/rcmgr.go
@@ -12,7 +12,6 @@ import (
"github.com/ipfs/kubo/core/node/helpers"
"github.com/ipfs/kubo/repo"
- "github.com/filecoin-project/go-clock"
logging "github.com/ipfs/go-log/v2"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p/core/network"
@@ -112,7 +111,6 @@ filled in with autocomputed defaults.`)
return nil, opts, fmt.Errorf("creating libp2p resource manager: %w", err)
}
lrm := &loggingResourceManager{
- clock: clock.New(),
logger: &logging.Logger("resourcemanager").SugaredLogger,
delegate: manager,
}
diff --git a/core/node/libp2p/rcmgr_logging.go b/core/node/libp2p/rcmgr_logging.go
index 28188b0fc..72ee07668 100644
--- a/core/node/libp2p/rcmgr_logging.go
+++ b/core/node/libp2p/rcmgr_logging.go
@@ -7,7 +7,6 @@ import (
"sync"
"time"
- "github.com/filecoin-project/go-clock"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
@@ -17,7 +16,6 @@ import (
)
type loggingResourceManager struct {
- clock clock.Clock
logger *zap.SugaredLogger
delegate network.ResourceManager
logInterval time.Duration
@@ -42,7 +40,7 @@ func (n *loggingResourceManager) start(ctx context.Context) {
if logInterval == 0 {
logInterval = 10 * time.Second
}
- ticker := n.clock.Ticker(logInterval)
+ ticker := time.NewTicker(logInterval)
go func() {
defer ticker.Stop()
for {
diff --git a/core/node/libp2p/rcmgr_logging_test.go b/core/node/libp2p/rcmgr_logging_test.go
index a49891829..1cc83eb34 100644
--- a/core/node/libp2p/rcmgr_logging_test.go
+++ b/core/node/libp2p/rcmgr_logging_test.go
@@ -2,9 +2,9 @@ package libp2p
import (
"testing"
+ "testing/synctest"
"time"
- "github.com/filecoin-project/go-clock"
"github.com/libp2p/go-libp2p/core/network"
rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
ma "github.com/multiformats/go-multiaddr"
@@ -14,48 +14,49 @@ import (
)
func TestLoggingResourceManager(t *testing.T) {
- clock := clock.NewMock()
- orig := rcmgr.DefaultLimits.AutoScale()
- limits := orig.ToPartialLimitConfig()
- limits.System.Conns = 1
- limits.System.ConnsInbound = 1
- limits.System.ConnsOutbound = 1
- limiter := rcmgr.NewFixedLimiter(limits.Build(orig))
- rm, err := rcmgr.NewResourceManager(limiter)
- if err != nil {
- t.Fatal(err)
- }
-
- oCore, oLogs := observer.New(zap.WarnLevel)
- oLogger := zap.New(oCore)
- lrm := &loggingResourceManager{
- clock: clock,
- logger: oLogger.Sugar(),
- delegate: rm,
- logInterval: 1 * time.Second,
- }
-
- // 2 of these should result in resource limit exceeded errors and subsequent log messages
- for i := 0; i < 3; i++ {
- _, _ = lrm.OpenConnection(network.DirInbound, false, ma.StringCast("/ip4/127.0.0.1/tcp/1234"))
- }
-
- // run the logger which will write an entry for those errors
- ctx := t.Context()
- lrm.start(ctx)
- clock.Add(3 * time.Second)
-
- timer := time.NewTimer(1 * time.Second)
- for {
- select {
- case <-timer.C:
- t.Fatalf("expected logs never arrived")
- default:
- if oLogs.Len() == 0 {
- continue
- }
- require.Equal(t, "Protected from exceeding resource limits 2 times. libp2p message: \"system: cannot reserve inbound connection: resource limit exceeded\".", oLogs.All()[0].Message)
- return
+ synctest.Test(t, func(t *testing.T) {
+ orig := rcmgr.DefaultLimits.AutoScale()
+ limits := orig.ToPartialLimitConfig()
+ limits.System.Conns = 1
+ limits.System.ConnsInbound = 1
+ limits.System.ConnsOutbound = 1
+ limiter := rcmgr.NewFixedLimiter(limits.Build(orig))
+ rm, err := rcmgr.NewResourceManager(limiter)
+ if err != nil {
+ t.Fatal(err)
}
- }
+ defer rm.Close()
+
+ oCore, oLogs := observer.New(zap.WarnLevel)
+ oLogger := zap.New(oCore)
+ lrm := &loggingResourceManager{
+ logger: oLogger.Sugar(),
+ delegate: rm,
+ logInterval: 1 * time.Second,
+ }
+
+ // 2 of these should result in resource limit exceeded errors and subsequent log messages
+ for i := 0; i < 3; i++ {
+ _, _ = lrm.OpenConnection(network.DirInbound, false, ma.StringCast("/ip4/127.0.0.1/tcp/1234"))
+ }
+
+ // run the logger which will write an entry for those errors
+ ctx := t.Context()
+ lrm.start(ctx)
+ time.Sleep(3 * time.Second)
+
+ timer := time.NewTimer(1 * time.Second)
+ for {
+ select {
+ case <-timer.C:
+ t.Fatalf("expected logs never arrived")
+ default:
+ if oLogs.Len() == 0 {
+ continue
+ }
+ require.Equal(t, "Protected from exceeding resource limits 2 times. libp2p message: \"system: cannot reserve inbound connection: resource limit exceeded\".", oLogs.All()[0].Message)
+ return
+ }
+ }
+ })
}
diff --git a/coverage/Rules.mk b/coverage/Rules.mk
index 48fce2856..84a4a1887 100644
--- a/coverage/Rules.mk
+++ b/coverage/Rules.mk
@@ -3,33 +3,14 @@ include mk/header.mk
GOCC ?= go
$(d)/coverage_deps: $$(DEPS_GO) cmd/ipfs/ipfs
- rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover
rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover
-ifneq ($(IPFS_SKIP_COVER_BINS),1)
-$(d)/coverage_deps: test/bin/gocovmerge
-endif
-
.PHONY: $(d)/coverage_deps
-# unit tests coverage
-UTESTS_$(d) := $(shell $(GOCC) list -f '{{if (or (len .TestGoFiles) (len .XTestGoFiles))}}{{.ImportPath}}{{end}}' $(go-flags-with-tags) ./... | grep -v go-ipfs/vendor | grep -v go-ipfs/Godeps)
+# unit tests coverage is now produced by test_unit target in mk/golang.mk
+# (outputs coverage/unit_tests.coverprofile and test/unit/gotest.json)
-UCOVER_$(d) := $(addsuffix .coverprofile,$(addprefix $(d)/unitcover/, $(subst /,_,$(UTESTS_$(d)))))
-
-$(UCOVER_$(d)): $(d)/coverage_deps ALWAYS
- $(eval TMP_PKG := $(subst _,/,$(basename $(@F))))
- $(eval TMP_DEPS := $(shell $(GOCC) list -f '{{range .Deps}}{{.}} {{end}}' $(go-flags-with-tags) $(TMP_PKG) | sed 's/ /\n/g' | grep ipfs/go-ipfs) $(TMP_PKG))
- $(eval TMP_DEPS_LIST := $(call join-with,$(comma),$(TMP_DEPS)))
- $(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) -v -covermode=atomic -json -coverpkg=$(TMP_DEPS_LIST) -coverprofile=$@ $(TMP_PKG) | tee -a test/unit/gotest.json
-
-
-$(d)/unit_tests.coverprofile: $(UCOVER_$(d))
- gocovmerge $^ > $@
-
-TGTS_$(d) := $(d)/unit_tests.coverprofile
-
-.PHONY: $(d)/unit_tests.coverprofile
+TGTS_$(d) :=
# sharness tests coverage
$(d)/ipfs: GOTAGS += testrunmain
@@ -46,7 +27,7 @@ endif
export IPFS_COVER_DIR:= $(realpath $(d))/sharnesscover/
$(d)/sharness_tests.coverprofile: export TEST_PLUGIN=0
-$(d)/sharness_tests.coverprofile: $(d)/ipfs cmd/ipfs/ipfs-test-cover $(d)/coverage_deps test_sharness
+$(d)/sharness_tests.coverprofile: $(d)/ipfs cmd/ipfs/ipfs-test-cover $(d)/coverage_deps test/bin/gocovmerge test_sharness
(cd $(@D)/sharnesscover && find . -type f | gocovmerge -list -) > $@
diff --git a/docs/examples/kubo-as-a-library/main.go b/docs/examples/kubo-as-a-library/main.go
index ffa86c7f0..8b2181ed7 100644
--- a/docs/examples/kubo-as-a-library/main.go
+++ b/docs/examples/kubo-as-a-library/main.go
@@ -47,7 +47,7 @@ func setupPlugins(externalPluginsPath string) error {
return nil
}
-func createTempRepo(swarmPort int) (string, error) {
+func createTempRepo() (string, error) {
repoPath, err := os.MkdirTemp("", "ipfs-shell")
if err != nil {
return "", fmt.Errorf("failed to get temp dir: %s", err)
@@ -59,15 +59,28 @@ func createTempRepo(swarmPort int) (string, error) {
return "", err
}
- // Configure custom ports to avoid conflicts with other IPFS instances.
- // This demonstrates how to customize the node's network addresses.
+ // Use TCP-only on loopback with random port for reliable local testing.
+ // This matches what kubo's test harness uses (test/cli/transports_test.go).
+ // QUIC/UDP transports are avoided because they may be throttled on CI.
cfg.Addresses.Swarm = []string{
- fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", swarmPort),
- fmt.Sprintf("/ip4/0.0.0.0/udp/%d/quic-v1", swarmPort),
- fmt.Sprintf("/ip4/0.0.0.0/udp/%d/quic-v1/webtransport", swarmPort),
- fmt.Sprintf("/ip4/0.0.0.0/udp/%d/webrtc-direct", swarmPort),
+ "/ip4/127.0.0.1/tcp/0",
}
+ // Explicitly disable non-TCP transports for reliability.
+ cfg.Swarm.Transports.Network.QUIC = config.False
+ cfg.Swarm.Transports.Network.Relay = config.False
+ cfg.Swarm.Transports.Network.WebTransport = config.False
+ cfg.Swarm.Transports.Network.WebRTCDirect = config.False
+ cfg.Swarm.Transports.Network.Websocket = config.False
+ cfg.AutoTLS.Enabled = config.False
+
+ // Disable routing - we don't need DHT for direct peer connections.
+ // Bitswap works with directly connected peers without needing DHT lookups.
+ cfg.Routing.Type = config.NewOptionalString("none")
+
+ // Disable bootstrap for this example - we manually connect only the peers we need.
+ cfg.Bootstrap = []string{}
+
// When creating the repository, you can define custom settings on the repository, such as enabling experimental
// features (See experimental-features.md) or customizing the gateway endpoint.
// To do such things, you should modify the variable `cfg`. For example:
@@ -106,10 +119,14 @@ func createNode(ctx context.Context, repoPath string) (*core.IpfsNode, error) {
// Construct the node
nodeOptions := &core.BuildCfg{
- Online: true,
- Routing: libp2p.DHTOption, // This option sets the node to be a full DHT node (both fetching and storing DHT Records)
- // Routing: libp2p.DHTClientOption, // This option sets the node to be a client DHT node (only fetching records)
- Repo: repo,
+ Online: true,
+ // For this example, we use NilRouterOption (no routing) since we connect peers directly.
+ // Bitswap works with directly connected peers without needing DHT lookups.
+ // In production, you would typically use:
+ // Routing: libp2p.DHTOption, // Full DHT node (stores and fetches records)
+ // Routing: libp2p.DHTClientOption, // DHT client (only fetches records)
+ Routing: libp2p.NilRouterOption,
+ Repo: repo,
}
return core.NewNode(ctx, nodeOptions)
@@ -118,8 +135,7 @@ func createNode(ctx context.Context, repoPath string) (*core.IpfsNode, error) {
var loadPluginsOnce sync.Once
// Spawns a node to be used just for this run (i.e. creates a tmp repo).
-// The swarmPort parameter specifies the port for libp2p swarm listeners.
-func spawnEphemeral(ctx context.Context, swarmPort int) (icore.CoreAPI, *core.IpfsNode, error) {
+func spawnEphemeral(ctx context.Context) (icore.CoreAPI, *core.IpfsNode, error) {
var onceErr error
loadPluginsOnce.Do(func() {
onceErr = setupPlugins("")
@@ -129,7 +145,7 @@ func spawnEphemeral(ctx context.Context, swarmPort int) (icore.CoreAPI, *core.Ip
}
// Create a Temporary Repo
- repoPath, err := createTempRepo(swarmPort)
+ repoPath, err := createTempRepo()
if err != nil {
return nil, nil, fmt.Errorf("failed to create temp repo: %s", err)
}
@@ -207,8 +223,7 @@ func main() {
defer cancel()
// Spawn a local peer using a temporary path, for testing purposes
- // Using port 4010 to avoid conflict with default IPFS port 4001
- ipfsA, nodeA, err := spawnEphemeral(ctx, 4010)
+ ipfsA, nodeA, err := spawnEphemeral(ctx)
if err != nil {
panic(fmt.Errorf("failed to spawn peer node: %s", err))
}
@@ -222,9 +237,8 @@ func main() {
fmt.Printf("Added file to peer with CID %s\n", peerCidFile.String())
// Spawn a node using a temporary path, creating a temporary repo for the run
- // Using port 4011 (different from nodeA's port 4010)
fmt.Println("Spawning Kubo node on a temporary repo")
- ipfsB, _, err := spawnEphemeral(ctx, 4011)
+ ipfsB, _, err := spawnEphemeral(ctx)
if err != nil {
panic(fmt.Errorf("failed to spawn ephemeral node: %s", err))
}
@@ -297,11 +311,12 @@ func main() {
fmt.Printf("Got directory back from IPFS (IPFS path: %s) and wrote it to %s\n", cidDirectory.String(), outputPathDirectory)
- /// --- Part IV: Getting a file from the IPFS Network
+ /// --- Part IV: Getting a file from another IPFS node
- fmt.Println("\n-- Going to connect to a few nodes in the Network as bootstrappers --")
+ fmt.Println("\n-- Connecting to nodeA and fetching content via bitswap --")
- // Get nodeA's address so we can fetch the file we added to it
+ // Get nodeA's actual listening address dynamically.
+ // We configured TCP-only on 127.0.0.1 with random port, so this will be a TCP address.
peerAddrs, err := ipfsA.Swarm().LocalAddrs(ctx)
if err != nil {
panic(fmt.Errorf("could not get peer addresses: %s", err))
@@ -309,26 +324,18 @@ func main() {
peerMa := peerAddrs[0].String() + "/p2p/" + nodeA.Identity.String()
bootstrapNodes := []string{
- // In production, use autoconf.FallbackBootstrapPeers from boxo/autoconf
- // which includes well-known IPFS bootstrap peers like:
+ // In production, use real bootstrap peers like:
// "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
- // "/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
- // "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
-
- // You can add custom peers here. For example, another IPFS node:
- // "/ip4/192.0.2.1/tcp/4001/p2p/QmYourPeerID...",
- // "/ip4/192.0.2.1/udp/4001/quic-v1/p2p/QmYourPeerID...",
-
- // nodeA's address (the peer we created above that has our test file)
+ // For this example, we only connect to nodeA which has our test content.
peerMa,
}
- fmt.Println("Connecting to peers...")
+ fmt.Println("Connecting to peer...")
err = connectToPeers(ctx, ipfsB, bootstrapNodes)
if err != nil {
panic(fmt.Errorf("failed to connect to peers: %s", err))
}
- fmt.Println("Connected to peers")
+ fmt.Println("Connected to peer")
exampleCIDStr := peerCidFile.RootCid().String()
diff --git a/docs/examples/kubo-as-a-library/main_test.go b/docs/examples/kubo-as-a-library/main_test.go
index be601c6a9..ecc2a592a 100644
--- a/docs/examples/kubo-as-a-library/main_test.go
+++ b/docs/examples/kubo-as-a-library/main_test.go
@@ -1,21 +1,39 @@
package main
import (
+ "bytes"
+ "io"
+ "os"
"os/exec"
"strings"
"testing"
+ "time"
)
func TestExample(t *testing.T) {
- out, err := exec.Command("go", "run", "main.go").Output()
+ t.Log("Starting go run main.go...")
+ start := time.Now()
+
+ cmd := exec.Command("go", "run", "main.go")
+ cmd.Env = append(os.Environ(), "GOLOG_LOG_LEVEL=error") // reduce libp2p noise
+
+ // Stream output to both test log and capture buffer for verification
+ // This ensures we see progress even if the process is killed
+ var buf bytes.Buffer
+ cmd.Stdout = io.MultiWriter(os.Stdout, &buf)
+ cmd.Stderr = io.MultiWriter(os.Stderr, &buf)
+
+ err := cmd.Run()
+
+ elapsed := time.Since(start)
+ t.Logf("Command completed in %v", elapsed)
+
+ out := buf.String()
if err != nil {
- var stderr string
- if xe, ok := err.(*exec.ExitError); ok {
- stderr = string(xe.Stderr)
- }
- t.Fatalf("running example (%v): %s\n%s", err, string(out), stderr)
+ t.Fatalf("running example (%v):\n%s", err, out)
}
- if !strings.Contains(string(out), "All done!") {
- t.Errorf("example did not run successfully")
+
+ if !strings.Contains(out, "All done!") {
+ t.Errorf("example did not complete successfully, output:\n%s", out)
}
}
diff --git a/go.mod b/go.mod
index 8c3490fec..9b0035c73 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,6 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
- github.com/filecoin-project/go-clock v0.1.0
github.com/fsnotify/fsnotify v1.9.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-version v1.7.0
@@ -126,6 +125,7 @@ require (
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
+ github.com/filecoin-project/go-clock v0.1.0 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
github.com/gammazero/chanqueue v1.1.1 // indirect
diff --git a/mk/golang.mk b/mk/golang.mk
index b50179a0a..53bf5fca2 100644
--- a/mk/golang.mk
+++ b/mk/golang.mk
@@ -41,40 +41,57 @@ define go-build
$(GOCC) build $(go-flags-with-tags) -o "$@" "$(1)"
endef
-test_go_test: $$(DEPS_GO)
- $(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) ./...
-.PHONY: test_go_test
+# Only disable colors when running in CI (non-interactive terminal)
+GOTESTSUM_NOCOLOR := $(if $(CI),--no-color,)
-# Build all platforms from .github/build-platforms.yml
+# Packages excluded from coverage (test code and examples are not production code)
+COVERPKG_EXCLUDE := /(test|docs/examples)/
+
+# Packages excluded from unit tests: coverage exclusions + client/rpc (tested by test_cli)
+UNIT_EXCLUDE := /(test|docs/examples)/|/client/rpc$$
+
+# Unit tests with coverage
+# Produces JSON for CI reporting and coverage profile for Codecov
+test_unit: test/bin/gotestsum $$(DEPS_GO)
+ mkdir -p test/unit coverage
+ rm -f test/unit/gotest.json coverage/unit_tests.coverprofile
+ gotestsum $(GOTESTSUM_NOCOLOR) --jsonfile test/unit/gotest.json -- $(go-flags-with-tags) $(GOTFLAGS) -covermode=atomic -coverprofile=coverage/unit_tests.coverprofile -coverpkg=$$($(GOCC) list $(go-tags) ./... | grep -vE '$(COVERPKG_EXCLUDE)' | tr '\n' ',' | sed 's/,$$//') $$($(GOCC) list $(go-tags) ./... | grep -vE '$(UNIT_EXCLUDE)')
+.PHONY: test_unit
+
+# CLI/integration tests (requires built binary in PATH)
+# Includes test/cli, test/integration, and client/rpc
+# Produces JSON for CI reporting
+# Override TEST_CLI_TIMEOUT for local development: make test_cli TEST_CLI_TIMEOUT=5m
+TEST_CLI_TIMEOUT ?= 10m
+test_cli: cmd/ipfs/ipfs test/bin/gotestsum $$(DEPS_GO)
+ mkdir -p test/cli
+ rm -f test/cli/cli-tests.json
+ PATH="$(CURDIR)/cmd/ipfs:$(CURDIR)/test/bin:$$PATH" gotestsum $(GOTESTSUM_NOCOLOR) --jsonfile test/cli/cli-tests.json -- -v -timeout=$(TEST_CLI_TIMEOUT) ./test/cli/... ./test/integration/... ./client/rpc/...
+.PHONY: test_cli
+
+# Example tests (docs/examples/kubo-as-a-library)
+# Tests against both published and current kubo versions
+# Uses timeout to ensure CI gets output before job-level timeout kills everything
+TEST_EXAMPLES_TIMEOUT ?= 2m
+test_examples:
+ cd docs/examples/kubo-as-a-library && go test -v -timeout=$(TEST_EXAMPLES_TIMEOUT) ./... && cp go.mod go.mod.bak && cp go.sum go.sum.bak && (go mod edit -replace github.com/ipfs/kubo=./../../.. && go mod tidy && go test -v -timeout=$(TEST_EXAMPLES_TIMEOUT) ./...; ret=$$?; mv go.mod.bak go.mod; mv go.sum.bak go.sum; exit $$ret)
+.PHONY: test_examples
+
+# Build kubo for all platforms from .github/build-platforms.yml
test_go_build:
bin/test-go-build-platforms
.PHONY: test_go_build
-test_go_short: GOTFLAGS += -test.short
-test_go_short: test_go_test
-.PHONY: test_go_short
-
-test_go_race: GOTFLAGS += -race
-test_go_race: test_go_test
-.PHONY: test_go_race
-
-test_go_expensive: test_go_test test_go_build
-.PHONY: test_go_expensive
-TEST_GO += test_go_expensive
-
+# Check Go source formatting
test_go_fmt:
bin/test-go-fmt
.PHONY: test_go_fmt
-TEST_GO += test_go_fmt
+# Run golangci-lint (used by CI)
test_go_lint: test/bin/golangci-lint
golangci-lint run --timeout=3m ./...
.PHONY: test_go_lint
-test_go: $(TEST_GO)
-
-# Version check is no longer needed - go.mod enforces minimum version
-.PHONY: check_go_version
-
+TEST_GO := test_go_fmt test_unit test_cli test_examples
TEST += $(TEST_GO)
-TEST_SHORT += test_go_fmt test_go_short
+TEST_SHORT += test_go_fmt test_unit
diff --git a/test/cli/delegated_routing_v1_http_server_test.go b/test/cli/delegated_routing_v1_http_server_test.go
index 7883fa793..ffcc571b7 100644
--- a/test/cli/delegated_routing_v1_http_server_test.go
+++ b/test/cli/delegated_routing_v1_http_server_test.go
@@ -2,7 +2,6 @@ package cli
import (
"context"
- "encoding/json"
"strings"
"testing"
"time"
@@ -21,11 +20,6 @@ import (
"github.com/stretchr/testify/require"
)
-// swarmPeersOutput is used to parse the JSON output of 'ipfs swarm peers --enc=json'
-type swarmPeersOutput struct {
- Peers []struct{} `json:"Peers"`
-}
-
func TestRoutingV1Server(t *testing.T) {
t.Parallel()
@@ -206,11 +200,14 @@ func TestRoutingV1Server(t *testing.T) {
c, err := client.New(node.GatewayURL())
require.NoError(t, err)
- // Try to get closest peers - should fail gracefully with an error
+ // Try to get closest peers - should fail gracefully with an error.
+ // Use 60-second timeout (server has 30s routing timeout).
testCid, err := cid.Decode("QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn")
require.NoError(t, err)
- _, err = c.GetClosestPeers(context.Background(), testCid)
+ ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+ defer cancel()
+ _, err = c.GetClosestPeers(ctx, testCid)
require.Error(t, err)
// All these routing types should indicate DHT is not available
// The exact error message may vary based on implementation details
@@ -224,7 +221,7 @@ func TestRoutingV1Server(t *testing.T) {
}
})
- t.Run("GetClosestPeers returns peers for self", func(t *testing.T) {
+ t.Run("GetClosestPeers returns peers", func(t *testing.T) {
t.Parallel()
routingTypes := []string{"auto", "autoclient", "dht", "dhtclient"}
@@ -242,47 +239,33 @@ func TestRoutingV1Server(t *testing.T) {
})
node.StartDaemon()
- // Create client before waiting so we can probe DHT readiness
c, err := client.New(node.GatewayURL())
require.NoError(t, err)
// Query for closest peers to our own peer ID
key := peer.ToCid(node.PeerID())
- // Wait for node to connect to bootstrap peers and populate WAN DHT routing table
- minPeers := len(autoconf.FallbackBootstrapPeers)
- require.EventuallyWithT(t, func(t *assert.CollectT) {
- res := node.RunIPFS("swarm", "peers", "--enc=json")
- var output swarmPeersOutput
- err := json.Unmarshal(res.Stdout.Bytes(), &output)
- assert.NoError(t, err)
- peerCount := len(output.Peers)
- // Wait until we have at least minPeers connected
- assert.GreaterOrEqual(t, peerCount, minPeers,
- "waiting for at least %d bootstrap peers, currently have %d", minPeers, peerCount)
- }, 60*time.Second, time.Second)
-
- // Wait for DHT to be ready by probing GetClosestPeers until it succeeds
- require.EventuallyWithT(t, func(t *assert.CollectT) {
- probeCtx, probeCancel := context.WithTimeout(context.Background(), 30*time.Second)
- defer probeCancel()
- probeIter, probeErr := c.GetClosestPeers(probeCtx, key)
- if probeErr == nil {
- probeIter.Close()
+ // Wait for WAN DHT routing table to be populated.
+ // The server has a 30-second routing timeout, so we use 60 seconds
+ // per request to allow for network latency while preventing hangs.
+ // Total wait time is 2 minutes (locally passes in under 1 minute).
+ var records []*types.PeerRecord
+ require.EventuallyWithT(t, func(ct *assert.CollectT) {
+ ctx, cancel := context.WithTimeout(t.Context(), 60*time.Second)
+ defer cancel()
+ resultsIter, err := c.GetClosestPeers(ctx, key)
+ if !assert.NoError(ct, err) {
+ return
}
- assert.NoError(t, probeErr, "DHT should be ready to handle GetClosestPeers")
+ records, err = iter.ReadAllResults(resultsIter)
+ assert.NoError(ct, err)
}, 2*time.Minute, 5*time.Second)
- ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
- defer cancel()
- resultsIter, err := c.GetClosestPeers(ctx, key)
- require.NoError(t, err)
-
- records, err := iter.ReadAllResults(resultsIter)
- require.NoError(t, err)
-
// Verify we got some peers back from WAN DHT
- assert.NotEmpty(t, records, "should return some peers close to own peerid")
+ require.NotEmpty(t, records, "should return peers close to own peerid")
+
+ // Per IPIP-0476, GetClosestPeers returns at most 20 peers
+ assert.LessOrEqual(t, len(records), 20, "IPIP-0476 limits GetClosestPeers to 20 peers")
// Verify structure of returned records
for _, record := range records {
diff --git a/test/dependencies/go.mod b/test/dependencies/go.mod
index 826fd60eb..75bbdf72c 100644
--- a/test/dependencies/go.mod
+++ b/test/dependencies/go.mod
@@ -15,7 +15,7 @@ require (
github.com/ipfs/iptb-plugins v0.5.1
github.com/multiformats/go-multiaddr v0.16.1
github.com/multiformats/go-multihash v0.2.3
- gotest.tools/gotestsum v1.12.3
+ gotest.tools/gotestsum v1.13.0
)
require (
diff --git a/test/dependencies/go.sum b/test/dependencies/go.sum
index 829479591..78d6acaef 100644
--- a/test/dependencies/go.sum
+++ b/test/dependencies/go.sum
@@ -985,8 +985,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/gotestsum v1.12.3 h1:jFwenGJ0RnPkuKh2VzAYl1mDOJgbhobBDeL2W1iEycs=
-gotest.tools/gotestsum v1.12.3/go.mod h1:Y1+e0Iig4xIRtdmYbEV7K7H6spnjc1fX4BOuUhWw2Wk=
+gotest.tools/gotestsum v1.13.0 h1:+Lh454O9mu9AMG1APV4o0y7oDYKyik/3kBOiCqiEpRo=
+gotest.tools/gotestsum v1.13.0/go.mod h1:7f0NS5hFb0dWr4NtcsAsF0y1kzjEFfAil0HiBQJE03Q=
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
diff --git a/test/unit/Rules.mk b/test/unit/Rules.mk
index 69404637c..915d08f9a 100644
--- a/test/unit/Rules.mk
+++ b/test/unit/Rules.mk
@@ -2,7 +2,8 @@ include mk/header.mk
CLEAN += $(d)/gotest.json $(d)/gotest.junit.xml
-$(d)/gotest.junit.xml: test/bin/gotestsum coverage/unit_tests.coverprofile
+# Convert gotest.json (produced by test_unit) to JUnit XML format
+$(d)/gotest.junit.xml: test/bin/gotestsum $(d)/gotest.json
gotestsum --no-color --junitfile $@ --raw-command cat $(@D)/gotest.json
include mk/footer.mk