From c4d7db8e3a84dc7144cbcc181c0f973108ef2e0f Mon Sep 17 00:00:00 2001
From: Pedro Santos <pedro.santos@moxy.studio>
Date: Mon, 2 Dec 2019 00:51:22 +0000
Subject: [PATCH 1/2] refactor: use echo-server start and stop functions as
 promises

---
 .aegir.js    | 11 ++++-------
 package.json |  3 +--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.aegir.js b/.aegir.js
index 847d73a9b..69e938893 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -1,13 +1,10 @@
 'use strict'
 
-const promisify = require('promisify-es6')
 const createServer = require('ipfsd-ctl').createServer
 const EchoServer = require('interface-ipfs-core/src/utils/echo-http-server')
 const server = createServer()
 const echoServer = EchoServer.createServer()
 
-const echoServerStart = promisify(echoServer.start)
-const echoServerStop = promisify(echoServer.stop)
 module.exports = {
   bundlesize: { maxSize: '246kB' },
   webpack: {
@@ -27,20 +24,20 @@ module.exports = {
   },
   hooks: {
     node: {
-      pre: () => echoServerStart(),
-      post: () => echoServerStop()
+      pre: () => echoServer.start(),
+      post: () => echoServer.stop()
     },
     browser: {
       pre: () => {
         return Promise.all([
           server.start(),
-          echoServerStart()
+          echoServer.start()
         ])
       },
       post: () => {
         return Promise.all([
           server.stop(),
-          echoServerStop()
+          echoServer.stop()
         ])
       }
     }
diff --git a/package.json b/package.json
index 88c175538..7553d0e9e 100644
--- a/package.json
+++ b/package.json
@@ -84,11 +84,10 @@
     "cross-env": "^6.0.0",
     "detect-node": "^2.0.4",
     "go-ipfs-dep": "^0.4.22",
-    "interface-ipfs-core": "^0.123.0",
+    "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#refactor/http-server-util",
     "ipfsd-ctl": "^0.47.1",
     "ndjson": "^1.5.0",
     "nock": "^11.4.0",
-    "promisify-es6": "^1.0.3",
     "pull-stream": "^3.6.14",
     "pump": "^3.0.0",
     "stream-equal": "^1.1.1"

From cee9b772c1e1e8ac9c77c75ef12d6548868cba9b Mon Sep 17 00:00:00 2001
From: Alan Shaw <alan.shaw@protocol.ai>
Date: Mon, 2 Dec 2019 10:48:32 +0000
Subject: [PATCH 2/2] chore: update interface-ipfs-core version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7553d0e9e..25e596d77 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "cross-env": "^6.0.0",
     "detect-node": "^2.0.4",
     "go-ipfs-dep": "^0.4.22",
-    "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#refactor/http-server-util",
+    "interface-ipfs-core": "^0.124.0",
     "ipfsd-ctl": "^0.47.1",
     "ndjson": "^1.5.0",
     "nock": "^11.4.0",