chore: go-ipfs 0.11.0-rc1 + libp2p-relay-daemon 0.1.0

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
 # uncomment env below and define git revisions in ./scripts/custom-runtime.sh
 
 env:
-  IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
+  #IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
   IPFS_JS_EXEC: /tmp/js-ipfs/packages/ipfs/src/cli.js
   IPFS_JS_MODULE: /tmp/js-ipfs/packages/ipfs/dist/cjs/src/index.js
   IPFS_JS_HTTP_MODULE: /tmp/js-ipfs/packages/ipfs-http-client/dist/cjs/src/index.js
@@ -31,7 +31,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
-            ./go-libp2p-relay-daemon
+            ./scripts/libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -57,7 +57,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
-            ./go-libp2p-relay-daemon
+            ./scripts/libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -86,7 +86,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
-            ./go-libp2p-relay-daemon
+            ./scripts/libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -122,7 +122,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
-            ./go-libp2p-relay-daemon
+            ./scripts/libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -155,7 +155,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
-            ./go-libp2p-relay-daemon
+            ./scripts/libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}

.gitignore

@@ -39,4 +39,5 @@ test/test-data/go-ipfs-repo/LOG
 test/test-data/go-ipfs-repo/LOG.old
 types
 go-libp2p-relay-daemon
-*.identity
+scripts/libp2p-relay-daemon
+*.identity

package.json

@@ -23,7 +23,7 @@
     "npm": ">6.0.0"
   },
   "scripts": {
-    "postinstall": "./scripts/setup-relayd.sh",
+    "postinstall": "./scripts/setup-libp2p-relay-daemon.sh",
     "clean": "rimraf /tmp/js-ipfs /tmp/go-ipfs ./go-libp2p-relay-daemon",
     "lint": "aegir lint",
     "build": "aegir build",
@@ -102,7 +102,7 @@
   ],
   "devDependencies": {
     "execa": "^5.1.1",
-    "go-ipfs": "^0.9.1",
+    "go-ipfs": "0.11.0-rc1",
     "ipfs": "^0.59.0",
     "ipfs-http-client": "^53.0.0"
   }

scripts/setup-libp2p-relay-daemon.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# This script ensures go-libp2p-relay-daemon is available
+# for use in  circuit v1 and v2 tests.
+
+set -eo pipefail
+
+if ! test -e ./scripts/libp2p-relay-daemon; then
+    echo "Fetching ./scripts/libp2p-relay-daemon binary.."
+    GOBIN=$(realpath ./scripts) go install github.com/libp2p/go-libp2p-relay-daemon/cmd/libp2p-relay-daemon@v0.1.0
+    echo "./scripts/libp2p-relay-daemon is ready"
+fi

test/utils/relayd.js

@@ -12,7 +12,7 @@ export async function getRelayV (version, factory) {
   if (relays.has(version)) return relays.get(version)
   if (process.env.DEBUG) console.log(`Starting relayd_v${version}..`) // eslint-disable-line no-console
   if (version < 1 || version > 2) throw new Error('Unsupported circuit relay version')
-  const relayd = command(`go-libp2p-relay-daemon/relayd -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
+  const relayd = command(`scripts/libp2p-relay-daemon -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
   let id
   for await (const line of relayd.stdout) {
     const text = line.toString()