chore: move tests of compliance

libp2p · May 28, 2021 · f0700d7 · f0700d7
1 parent f3e24df
commit f0700d7
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 30 deletions.
diff --git a/.github/workflows/bundlesize.yml b/.github/workflows/bundlesize.yml
@@ -0,0 +1,30 @@
+
+# Checks bundlesize, does not run on master
+on:
+  pull_request:
+    branches:
+      - '*'
+
+name: Bundlesize
+jobs:
+  check:
+    runs-on: ubuntu-latest # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
+    strategy:
+      matrix:
+        node-version: [16]
+        project:
+          - packages/interfaces
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - uses: actions/checkout@v2
+      - run: npm install -g @mapbox/node-pre-gyp && npm install
+      - name: Bundlesize ${{ matrix.project }}
+        uses: ipfs/aegir/actions/[email protected]
+        continue-on-error: true
+        with:
+          project: ${{ matrix.project }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,41 +13,36 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: npm install
-    - run: npx aegir lint
-    - uses: gozala/[email protected]
-    - run: npx aegir build
-    - run: npx aegir dep-check
-    - uses: ipfs/aegir/actions/bundle-size@master
-      name: size
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+    - run: npm run lint
+    - run: npm run build
+    - run: npm run dep-check
   test-node:
     needs: check
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        node: [14, 15]
+        node: [14, 16]
       fail-fast: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
       - run: npm install
-      - run: npx nyc --reporter=lcov aegir test -t node -- --bail
+      - run: npm run test:node -- -- --bail
       - uses: codecov/codecov-action@v1
   test-chrome:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail
+      - run: npm run test:browser -- -- --bail
   test-firefox:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail -- --browsers FirefoxHeadless
+      - run: npm run test:browser -- -- --bail -- --browser firefox
diff --git a/lerna.json b/lerna.json
@@ -5,6 +5,9 @@
   ],
   "version": "independent",
   "command": {
+    "bootstrap": {
+      "hoist": true
+    },
     "run": {
       "stream": true
     },

diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "test:browser": "lerna run test:browser",
     "build": "lerna run build",
     "lint": "lerna run lint",
+    "dep-check": "lerna run dep-check",
     "release": "lerna run build && lerna publish"
   },
   "bugs": "https://github.com/libp2p/js-libp2p-interfaces/issues",

diff --git a/packages/compliance-tests/package.json b/packages/compliance-tests/package.json
@@ -11,6 +11,10 @@
   },
   "scripts": {
     "lint": "aegir lint",
+    "dep-check": "aegir dep-check",
+    "test": "aegir test",
+    "test:node": "aegir test --target node",
+    "test:browser": "aegir test --target browser",
     "release": "aegir release --no-test",
     "release-minor": "aegir release --type minor --no-test",
     "release-major": "aegir release --type major --no-test"
@@ -39,7 +43,7 @@
     "it-goodbye": "^3.0.0",
     "it-pair": "^1.0.0",
     "it-pipe": "^1.1.0",
-    "libp2p-interfaces": "../interfaces",
+    "libp2p-interfaces": "^0.11.0",
     "multiaddr": "^9.0.1",
     "p-defer": "^3.0.0",
     "p-limit": "^3.1.0",
@@ -49,6 +53,9 @@
     "streaming-iterables": "^5.0.4",
     "uint8arrays": "^2.1.3"
   },
+  "devDependencies": {
+    "it-handshake": "^2.0.0"
+  },
   "contributors": [
     "Alan Shaw <[email protected]>",
     "David Dias <[email protected]>",

diff --git a/packages/compliance-tests/src/stream-muxer/index.js b/packages/compliance-tests/src/stream-muxer/index.js
@@ -3,17 +3,14 @@
 'use strict'
 
 const baseTest = require('./base-test')
+const closeTest = require('./close-test')
 const stressTest = require('./stress-test')
 const megaStressTest = require('./mega-stress-test')
-const isNode = require('detect-node')
 
 module.exports = (common) => {
   describe('interface-stream-muxer', () => {
     baseTest(common)
-    if (isNode) {
-      const closeTest = require('./close-test')
-      closeTest(common)
-    }
+    closeTest(common)
     stressTest(common)
     megaStressTest(common)
   })

diff --git a/...rfaces/test/connection/compliance.spec.js → ...iance-tests/test/connection/index.spec.js b/...rfaces/test/connection/compliance.spec.js → ...iance-tests/test/connection/index.spec.js
@@ -1,9 +1,9 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('libp2p-interfaces-compliance-tests/src/connection')
-const { Connection } = require('../../src/connection')
-const peers = require('../utils/peers')
+const tests = require('../../src/connection')
+const { Connection } = require('libp2p-interfaces/src/connection')
+const peers = require('libp2p-interfaces/test/utils/peers')
 const PeerId = require('peer-id')
 const { Multiaddr } = require('multiaddr')
 const pair = require('it-pair')

diff --git a/...ages/interfaces/test/crypto/index.spec.js → ...ompliance-tests/test/crypto/index.spec.js b/...ages/interfaces/test/crypto/index.spec.js → ...ompliance-tests/test/crypto/index.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('libp2p-interfaces-compliance-tests/src/crypto')
+const tests = require('../../src/crypto')
 const mockCrypto = require('./mock-crypto')
 
 describe('compliance tests', () => {

diff --git a/...ges/interfaces/test/crypto/mock-crypto.js → ...mpliance-tests/test/crypto/mock-crypto.js b/...ges/interfaces/test/crypto/mock-crypto.js → ...mpliance-tests/test/crypto/mock-crypto.js
diff --git a/...erfaces/test/peer-discovery/index.spec.js → ...e-tests/test/peer-discovery/index.spec.js b/...erfaces/test/peer-discovery/index.spec.js → ...e-tests/test/peer-discovery/index.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('libp2p-interfaces-compliance-tests/src/peer-discovery')
+const tests = require('../../src/peer-discovery')
 const MockDiscovery = require('./mock-discovery')
 
 describe('compliance tests', () => {

diff --git a/...ces/test/peer-discovery/mock-discovery.js → ...sts/test/peer-discovery/mock-discovery.js b/...ces/test/peer-discovery/mock-discovery.js → ...sts/test/peer-discovery/mock-discovery.js
diff --git a/...terfaces/test/topology/mock-peer-store.js → ...ce-tests/test/topology/mock-peer-store.js b/...terfaces/test/topology/mock-peer-store.js → ...ce-tests/test/topology/mock-peer-store.js
diff --git a/...test/topology/multicodec-topology.spec.js → ...test/topology/multicodec-topology.spec.js b/...test/topology/multicodec-topology.spec.js → ...test/topology/multicodec-topology.spec.js
@@ -3,8 +3,8 @@
 
 const { EventEmitter } = require('events')
 
-const tests = require('libp2p-interfaces-compliance-tests/src/topology/multicodec-topology')
-const MulticodecTopology = require('../../src/topology/multicodec-topology')
+const tests = require('../../src/topology/multicodec-topology')
+const MulticodecTopology = require('libp2p-interfaces/src/topology/multicodec-topology')
 const MockPeerStore = require('./mock-peer-store')
 
 describe('multicodec topology compliance tests', () => {

diff --git a/...interfaces/test/topology/topology.spec.js → ...ance-tests/test/topology/topology.spec.js b/...interfaces/test/topology/topology.spec.js → ...ance-tests/test/topology/topology.spec.js
@@ -1,8 +1,8 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('libp2p-interfaces-compliance-tests/src/topology/topology')
-const Topology = require('../../src/topology')
+const tests = require('../../src/topology/topology')
+const Topology = require('libp2p-interfaces/src/topology')
 
 describe('topology compliance tests', () => {
   tests({

diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json
@@ -23,6 +23,7 @@
   },
   "scripts": {
     "lint": "aegir lint",
+    "dep-check": "aegir dep-check",
     "build": "npm run build:proto && npm run build:proto-types && npm run build:types",
     "build:types": "aegir build --no-bundle",
     "build:proto": "npm run build:proto:rpc && npm run build:proto:topic-descriptor",
@@ -73,9 +74,7 @@
     "aegir": "^33.0.0",
     "cids": "^1.1.6",
     "events": "^3.3.0",
-    "it-handshake": "^2.0.0",
     "it-pair": "^1.0.0",
-    "libp2p-interfaces-compliance-tests": "../compliance-tests",
     "p-wait-for": "^3.2.0",
     "rimraf": "^3.0.2",
     "sinon": "^10.0.0",

diff --git a/packages/interfaces/tsconfig.json b/packages/interfaces/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./node_modules/aegir/src/config/tsconfig.aegir.json",
+  "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
     "outDir": "dist"
   },