From 66131ae7dee51fa1c801a53949f547fdc0503cfc Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 2 Jul 2020 14:57:09 +0100
Subject: [PATCH 1/2] chore: upgrade go-ipfs-dep

---
 .../interface-ipfs-core/src/config/set.js     |  6 ++++--
 packages/ipfs-http-client/package.json        |  2 +-
 .../ipfs-http-client/test/interface.spec.js   | 20 ++-----------------
 packages/ipfs/package.json                    |  2 +-
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/packages/interface-ipfs-core/src/config/set.js b/packages/interface-ipfs-core/src/config/set.js
index bcde94a614..cdfd2d6ca0 100644
--- a/packages/interface-ipfs-core/src/config/set.js
+++ b/packages/interface-ipfs-core/src/config/set.js
@@ -84,8 +84,10 @@ module.exports = (common, options) => {
       return expect(ipfs.config.set(Buffer.from('heeey'), '')).to.eventually.be.rejected()
     })
 
-    it('should fail on non valid value', () => {
-      return expect(ipfs.config.set('Fruit', Buffer.from('abc'))).to.eventually.be.rejected()
+    it('should fail on non valid value', async () => {
+      const val = {}
+      val.val = val
+      return expect(ipfs.config.set('Fruit', val)).to.eventually.be.rejected()
     })
   })
 }
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index 31d37a466f..5b8ecb6213 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -70,7 +70,7 @@
   "devDependencies": {
     "aegir": "^23.0.0",
     "cross-env": "^7.0.0",
-    "go-ipfs-dep": "^0.5.1",
+    "go-ipfs-dep": "^0.6.0",
     "interface-ipfs-core": "^0.137.0",
     "ipfsd-ctl": "^4.1.1",
     "it-all": "^1.0.1",
diff --git a/packages/ipfs-http-client/test/interface.spec.js b/packages/ipfs-http-client/test/interface.spec.js
index bbf6a03bd5..9e367c160d 100644
--- a/packages/ipfs-http-client/test/interface.spec.js
+++ b/packages/ipfs-http-client/test/interface.spec.js
@@ -51,12 +51,7 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.bitswap(commonFactory, {
-    skip: [{
-      name: 'should get the wantlist by peer ID for a different node',
-      reason: 'unskip when https://github.com/ipfs/go-bitswap/pull/390 is released in go-ipfs'
-    }]
-  })
+  tests.bitswap(commonFactory)
 
   tests.block(commonFactory, {
     skip: [{
@@ -65,18 +60,7 @@ describe('interface-ipfs-core tests', () => {
     }]
   })
 
-  tests.bootstrap(commonFactory, {
-    skip: [{
-      name: 'should return a list containing the bootstrap peer when called with a valid arg (ip4)',
-      reason: 'TODO unskip when go-ipfs switches to p2p for libp2p keys'
-    }, {
-      name: 'should prevent duplicate inserts of bootstrap peers',
-      reason: 'TODO unskip when go-ipfs switches to p2p for libp2p keys'
-    }, {
-      name: 'should return a list containing the peer removed when called with a valid arg (ip4)',
-      reason: 'TODO unskip when go-ipfs switches to p2p for libp2p keys'
-    }]
-  })
+  tests.bootstrap(commonFactory)
 
   tests.config(commonFactory, {
     skip: [
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index ed14eca677..ebb661126e 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -177,7 +177,7 @@
     "delay": "^4.3.0",
     "execa": "^4.0.0",
     "form-data": "^3.0.0",
-    "go-ipfs-dep": "^0.5.1",
+    "go-ipfs-dep": "^0.6.0",
     "interface-ipfs-core": "^0.137.0",
     "ipfs-interop": "^1.0.4",
     "ipfsd-ctl": "^4.1.1",

From b09f578fae4e6967e5866076e619b4bb38c74d28 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 2 Jul 2020 15:12:32 +0100
Subject: [PATCH 2/2] chore: fix linting

---
 packages/interface-ipfs-core/src/config/set.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/interface-ipfs-core/src/config/set.js b/packages/interface-ipfs-core/src/config/set.js
index cdfd2d6ca0..2dcde164d3 100644
--- a/packages/interface-ipfs-core/src/config/set.js
+++ b/packages/interface-ipfs-core/src/config/set.js
@@ -84,7 +84,7 @@ module.exports = (common, options) => {
       return expect(ipfs.config.set(Buffer.from('heeey'), '')).to.eventually.be.rejected()
     })
 
-    it('should fail on non valid value', async () => {
+    it('should fail on non valid value', () => {
       const val = {}
       val.val = val
       return expect(ipfs.config.set('Fruit', val)).to.eventually.be.rejected()