diff --git a/README.md b/README.md
index 73e6d3e..709963e 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@
> Contains test suites and interfaces you can use to implement the various components of libp2p.
+## Lead Maintainer
+
+[Jacob Heun](https://github.com/jacobheun).
+
## Interfaces
- [Connection](./src/connection)
@@ -19,7 +23,7 @@
### Origin Repositories
-For posterity, here is a link to the original repositories for each of the interfaces (if they had one).
+For posterity, here are links to the original repositories for each of the interfaces (if they had one).
- [Connection](https://github.com/libp2p/interface-connection)
- [Content Routing](https://github.com/libp2p/interface-content-routing)
- [Peer Discovery](https://github.com/libp2p/interface-peer-discovery)
diff --git a/package.json b/package.json
index af725ab..bdb70ee 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
"devDependencies": {
"aegir": "^20.4.1",
"it-pair": "^1.0.0",
- "it-pipe": "^1.0.1"
+ "it-pipe": "^1.0.1",
+ "peer-info": "^0.17.0"
}
}
diff --git a/src/peer-discovery/.gitignore b/src/peer-discovery/.gitignore
deleted file mode 100644
index fd34c26..0000000
--- a/src/peer-discovery/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-**/node_modules/
-**/*.log
-package-lock.json
-
-# Coverage directory used by tools like istanbul
-coverage
-docs
-dist
diff --git a/src/peer-discovery/.travis.yml b/src/peer-discovery/.travis.yml
deleted file mode 100644
index c7f74c1..0000000
--- a/src/peer-discovery/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: node_js
-cache: npm
-stages:
- - check
- - test
- - cov
-
-node_js:
- - '10'
- - '12'
-
-os:
- - linux
- - osx
- - windows
-
-script: npx nyc -s npm run test:node -- --bail
-after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
-
-jobs:
- include:
- - stage: check
- script:
- - npx aegir dep-check
- - npm run lint
-
- - stage: test
- name: chrome
- addons:
- chrome: stable
- script: npx aegir test -t browser -t webworker
-
- - stage: test
- name: firefox
- addons:
- firefox: latest
- script: npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless
-
-notifications:
- email: false
diff --git a/src/peer-discovery/CHANGELOG.md b/src/peer-discovery/CHANGELOG.md
deleted file mode 100644
index 79bc3d7..0000000
--- a/src/peer-discovery/CHANGELOG.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-## [0.1.1](https://github.com/libp2p/interface-peer-discovery/compare/v0.1.0...v0.1.1) (2019-09-27)
-
-
-### Bug Fixes
-
-* add async support to setup ([#11](https://github.com/libp2p/interface-peer-discovery/issues/11)) ([2814c76](https://github.com/libp2p/interface-peer-discovery/commit/2814c76))
-
-
-
-
-# [0.1.0](https://github.com/libp2p/interface-peer-discovery/compare/v0.0.1...v0.1.0) (2019-09-27)
-
-
-
-
-## 0.0.1 (2017-02-09)
-
-
-
diff --git a/src/peer-discovery/LICENSE b/src/peer-discovery/LICENSE
deleted file mode 100644
index 7789aab..0000000
--- a/src/peer-discovery/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 libp2p
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/peer-discovery/README.md b/src/peer-discovery/README.md
index 265cf45..74bb96c 100644
--- a/src/peer-discovery/README.md
+++ b/src/peer-discovery/README.md
@@ -1,11 +1,6 @@
interface-peer-discovery
========================
-[](http://protocol.ai)
-[](http://libp2p.io/)
-[](http://webchat.freenode.net/?channels=%23libp2p)
-[](https://discuss.libp2p.io)
-
> A test suite and interface you can use to implement a Peer Discovery module for libp2p.
The primary goal of this module is to enable developers to pick and/or swap their Peer Discovery modules as they see fit for their application, without having to go through shims or compatibility issues. This module and test suite was heavily inspired by [abstract-blob-store](https://github.com/maxogden/abstract-blob-store).
@@ -14,10 +9,6 @@ Publishing a test suite as a module lets multiple modules all ensure compatibili
The API is presented with both Node.js and Go primitives, however, there is not actual limitations for it to be extended for any other language, pushing forward the cross compatibility and interop through diferent stacks.
-## Lead Maintainer
-
-[Vasco Santos](https://github.com/vasco-santos).
-
## Modules that implement the interface
- [JavaScript libp2p-mdns](https://github.com/libp2p/js-libp2p-mdns)
diff --git a/src/peer-discovery/package.json b/src/peer-discovery/package.json
deleted file mode 100644
index e897719..0000000
--- a/src/peer-discovery/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "name": "interface-discovery",
- "version": "0.1.1",
- "description": "A test suite and interface you can use to implement a discovery interface.",
- "leadMaintainer": "Vasco Santos ",
- "main": "src/index.js",
- "scripts": {
- "lint": "aegir lint",
- "build": "aegir build",
- "test": "aegir test",
- "test:node": "aegir test -t node",
- "test:browser": "aegir test -t browser -t webworker",
- "release": "aegir release",
- "release-minor": "aegir release --type minor",
- "release-major": "aegir release --type major"
- },
- "pre-push": [
- "lint"
- ],
- "repository": {
- "type": "git",
- "url": "https://github.com/libp2p/interface-peer-discovery.git"
- },
- "keywords": [
- "libp2p",
- "network",
- "p2p",
- "peer",
- "discovery",
- "peer-to-peer",
- "IPFS"
- ],
- "author": "David Dias ",
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/libp2p/interface-peer-discovery/issues"
- },
- "homepage": "https://github.com/libp2p/interface-peer-discovery",
- "dependencies": {},
- "devDependencies": {
- "aegir": "^20.3.1",
- "chai": "^4.2.0",
- "dirty-chai": "^2.0.1",
- "peer-id": "^0.13.3",
- "peer-info": "^0.17.0"
- },
- "engines": {
- "node": ">=10.0.0",
- "npm": ">=6.0.0"
- },
- "contributors": [
- "David Dias ",
- "Jacob Heun ",
- "Mike Goelzer ",
- "Vasco Santos ",
- "Vasco Santos "
- ]
-}
diff --git a/src/peer-discovery/index.js b/src/peer-discovery/tests/index.js
similarity index 100%
rename from src/peer-discovery/index.js
rename to src/peer-discovery/tests/index.js
diff --git a/src/peer-discovery/test/compliance.spec.js b/test/peer-discovery/compliance.spec.js
similarity index 86%
rename from src/peer-discovery/test/compliance.spec.js
rename to test/peer-discovery/compliance.spec.js
index 5b54fba..6602f09 100644
--- a/src/peer-discovery/test/compliance.spec.js
+++ b/test/peer-discovery/compliance.spec.js
@@ -1,7 +1,7 @@
/* eslint-env mocha */
'use strict'
-const tests = require('../src')
+const tests = require('../../src/peer-discovery/tests')
const MockDiscovery = require('./mock-discovery')
describe('compliance tests', () => {
diff --git a/src/peer-discovery/test/mock-discovery.js b/test/peer-discovery/mock-discovery.js
similarity index 100%
rename from src/peer-discovery/test/mock-discovery.js
rename to test/peer-discovery/mock-discovery.js