From d138441c28e8478ba519f99ad720a8ded4651475 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Tue, 22 Feb 2022 16:10:52 +0100
Subject: [PATCH] fix: EnableHolePunching enabled by default

This fixes interop tests when Swarm.EnableHolePunching in go-ipfs is
enabled by default.

Ref. https://github.com/ipfs/go-ipfs/pull/8748
---
 package-lock.json                    | 13 +++++++------
 package.json                         |  2 +-
 scripts/setup-libp2p-relay-daemon.js |  2 +-
 test/utils/circuit.js                |  2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b992e86..39db6658 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "ipfs-interop": "bin/ipfs-interop.js"
       },
       "devDependencies": {
-        "go-ipfs": "^0.11.0",
+        "go-ipfs": "^0.12.2",
         "ipfs": "^0.61.0",
         "ipfs-http-client": "^55.0.0"
       },
@@ -9136,13 +9136,13 @@
       }
     },
     "node_modules/go-ipfs": {
-      "version": "0.11.0",
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.12.2.tgz",
+      "integrity": "sha512-4eA4xFRDM1JfC3W+IkAk2VUauVWKp3zHghiXCs+8SizhNrfajTwzhLduFNnQtjLYicXlhfX1Hjm8uk011ypV6Q==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "cachedir": "^2.3.0",
-        "go-platform": "^1.0.0",
         "got": "^11.7.0",
         "gunzip-maybe": "^1.4.2",
         "hasha": "^5.2.2",
@@ -28939,11 +28939,12 @@
       }
     },
     "go-ipfs": {
-      "version": "0.11.0",
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.12.2.tgz",
+      "integrity": "sha512-4eA4xFRDM1JfC3W+IkAk2VUauVWKp3zHghiXCs+8SizhNrfajTwzhLduFNnQtjLYicXlhfX1Hjm8uk011ypV6Q==",
       "dev": true,
       "requires": {
         "cachedir": "^2.3.0",
-        "go-platform": "^1.0.0",
         "got": "^11.7.0",
         "gunzip-maybe": "^1.4.2",
         "hasha": "^5.2.2",
diff --git a/package.json b/package.json
index 3242f8d7..0d65e108 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,7 @@
     "wherearewe": "^1.0.0"
   },
   "devDependencies": {
-    "go-ipfs": "^0.11.0",
+    "go-ipfs": "^0.12.2",
     "ipfs": "^0.61.0",
     "ipfs-http-client": "^55.0.0"
   },
diff --git a/scripts/setup-libp2p-relay-daemon.js b/scripts/setup-libp2p-relay-daemon.js
index a91ac8a2..8ebbfe6d 100755
--- a/scripts/setup-libp2p-relay-daemon.js
+++ b/scripts/setup-libp2p-relay-daemon.js
@@ -81,7 +81,7 @@ async function getDownloadURL (version, platform, arch, distUrl) {
   }
 
   if (!data.platforms[platform].archs[arch]) {
-    throw new Error(`No binary available for arch '${arch}'`)
+    throw new Error(`No binary available for platform '${platform}' and arch '${arch}'`)
   }
 
   const link = data.platforms[platform].archs[arch].link
diff --git a/test/utils/circuit.js b/test/utils/circuit.js
index c09db76c..55422554 100644
--- a/test/utils/circuit.js
+++ b/test/utils/circuit.js
@@ -94,6 +94,7 @@ export async function createGo (addrs, factory, relay) {
           Swarm: addrs
         },
         Swarm: {
+          EnableHolePunching: false,
           // go uses circuit v2
           RelayClient: {
             Enabled: true,
@@ -130,6 +131,7 @@ export function createGoRelay (addrs, factory) {
           Swarm: addrs
         },
         Swarm: {
+          EnableHolePunching: false,
           // go uses circuit v2
           RelayClient: {
             Enabled: false