From 6b11fcca14c886a2d24057c2528be0e03d7f98e5 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 15 Jul 2018 09:27:49 +0200
Subject: [PATCH 1/2] test: enable circuit-relay tests

---
 test/circuit.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/circuit.js b/test/circuit.js
index be749067..9ba273ba 100644
--- a/test/circuit.js
+++ b/test/circuit.js
@@ -23,9 +23,9 @@ const baseTest = {
   timeout
 }
 
-// TODO: unskip once go-ipfs 0.4.16 is out
-describe.skip('circuit', () => {
+describe('circuit', () => {
   const tests = all
+
   if (!isNode) {
     Object.assign(tests, browser)
   }
@@ -37,7 +37,11 @@ describe.skip('circuit', () => {
     let nodeB
 
     tests[test] = Object.assign({}, baseTest, tests[test])
-    const dsc = tests[test].skip && tests[test].skip() ? describe.skip : describe
+
+    const dsc = tests[test].skip && tests[test].skip()
+      ? describe.skip
+      : describe
+
     dsc(test, function () {
       this.timeout(tests[test].timeout)
 

From 5345a1712933ae30a130aa57ea4295fcf4a5bc2a Mon Sep 17 00:00:00 2001
From: Dmitriy Ryajov <dryajov@gmail.com>
Date: Mon, 30 Jul 2018 15:04:50 -0600
Subject: [PATCH 2/2] fix: config - move relay out of experimental

---
 package.json          |  2 +-
 test/utils/circuit.js | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 3f8296e4..038d6506 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "form-data": "^2.3.2",
     "go-ipfs-dep": "~0.4.17",
     "hat": "0.0.3",
-    "ipfs": "~0.30.1",
+    "ipfs": "~0.31.1",
     "ipfs-api": "^22.2.4",
     "ipfsd-ctl": "~0.39.0",
     "left-pad": "^1.3.0",
diff --git a/test/utils/circuit.js b/test/utils/circuit.js
index 2ae7d5d0..36e1352c 100644
--- a/test/utils/circuit.js
+++ b/test/utils/circuit.js
@@ -25,8 +25,7 @@ const baseConf = {
   },
   Discovery: {
     MDNS: {
-      Enabled:
-        false
+      Enabled: false
     }
   }
 }
@@ -38,12 +37,10 @@ exports.createProcNode = (addrs, callback) => {
       Addresses: {
         Swarm: addrs
       },
-      EXPERIMENTAL: {
-        relay: {
-          enabled: true,
-          hop: {
-            enabled: true
-          }
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: true
         }
       }
     })
@@ -62,12 +59,10 @@ exports.createJsNode = (addrs, callback) => {
       Addresses: {
         Swarm: addrs
       },
-      EXPERIMENTAL: {
-        relay: {
-          enabled: true,
-          hop: {
-            enabled: true
-          }
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: true
         }
       }
     })