From f9407ce1ecc3893596bfdefdc8a4695d11318f39 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Thu, 21 Oct 2021 13:17:37 +0200
Subject: [PATCH] chore: switch to unreleased go/js-ipfs

the Rube Goldberg machine for testing HTTP RPC wire format
changes end-to-end
---
 .github/workflows/test.yml |  8 ++++----
 .gitignore                 |  2 +-
 README.md                  |  6 ++++++
 package-lock.json          |  3 ++-
 scripts/custom-runtime.sh  | 10 +++++-----
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24774370..f290b242 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,10 +7,10 @@ on:
 env:
   # To run CI against unrelased go-ipfs or js-ipfs-* code (eg. wip PR),
   # uncomment below and define git revisions in ./scripts/custom-runtime.sh
-  #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
+  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
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index 729bf0ce..3f0082bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,4 @@ dist
 test/test-data/go-ipfs-repo/LOCK
 test/test-data/go-ipfs-repo/LOG
 test/test-data/go-ipfs-repo/LOG.old
-types
\ No newline at end of file
+types
diff --git a/README.md b/README.md
index 88fb333b..4c5d2730 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,12 @@ $ npm install -g ipfs-interop
 $ ipfs-interop
 ```
 
+### Run a particular test locally
+
+```console
+$ node bin/ipfs-interop.js -- -t node --grep {substring-test-name}
+```
+
 ## Testing with different versions of go/js IPFS
 
 ### As a project
diff --git a/package-lock.json b/package-lock.json
index 166641b6..564d9733 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
     "": {
       "name": "ipfs-interop",
       "version": "7.0.5",
+      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "aegir": "^35.0.2",
@@ -49,7 +50,7 @@
         "ipfs-http-client": "^53.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=16.0.0",
         "npm": ">6.0.0"
       }
     },
diff --git a/scripts/custom-runtime.sh b/scripts/custom-runtime.sh
index 87cdc7fc..e6cf2744 100755
--- a/scripts/custom-runtime.sh
+++ b/scripts/custom-runtime.sh
@@ -22,10 +22,10 @@ WORKDIR=$(pwd)
 if [ "$IPFS_GO_EXEC" == /tmp/go-ipfs/cmd/ipfs/ipfs ]; then
 if [ ! -d /tmp/go-ipfs ]; then
     cd /tmp
-        git clone https://github.com/ipfs/go-ipfs.git
+        git clone https://github.com/coryschwartz/go-ipfs.git
         cd go-ipfs
-            # set implementation to specific commit
-            git checkout CHANGEME_GO
+            # implementation from https://github.com/ipfs/go-ipfs/pull/8183
+            git checkout 153697d524f449ee9bec97245b0fcd7ebc2e8170
             make build
 fi
 fi
@@ -35,8 +35,8 @@ if [ ! -d /tmp/js-ipfs ]; then
     cd /tmp
         git clone https://github.com/ipfs/js-ipfs.git
         cd js-ipfs
-            # set implementation to specific commit
-            git checkout CHANGEME_JS
+            # implementation from https://github.com/ipfs/js-ipfs/pull/3922
+            git checkout 1dcac76f56972fc3519526e93567e39d685033dd
             npm install
             npm run build
             npm run link