Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Commit f0700d7

Browse files
committed
chore: move tests of compliance
1 parent f3e24df commit f0700d7

File tree

16 files changed

+62
-30
lines changed

16 files changed

+62
-30
lines changed

.github/workflows/bundlesize.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
# Checks bundlesize, does not run on master
3+
on:
4+
pull_request:
5+
branches:
6+
- '*'
7+
8+
name: Bundlesize
9+
jobs:
10+
check:
11+
runs-on: ubuntu-latest # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
12+
strategy:
13+
matrix:
14+
node-version: [16]
15+
project:
16+
- packages/interfaces
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v1
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
- uses: actions/checkout@v2
24+
- run: npm install -g @mapbox/node-pre-gyp && npm install
25+
- name: Bundlesize ${{ matrix.project }}
26+
uses: ipfs/aegir/actions/[email protected]
27+
continue-on-error: true
28+
with:
29+
project: ${{ matrix.project }}
30+
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,36 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515
- run: npm install
16-
- run: npx aegir lint
17-
- uses: gozala/[email protected]
18-
- run: npx aegir build
19-
- run: npx aegir dep-check
20-
- uses: ipfs/aegir/actions/bundle-size@master
21-
name: size
22-
with:
23-
github_token: ${{ secrets.GITHUB_TOKEN }}
16+
- run: npm run lint
17+
- run: npm run build
18+
- run: npm run dep-check
2419
test-node:
2520
needs: check
2621
runs-on: ${{ matrix.os }}
2722
strategy:
2823
matrix:
2924
os: [windows-latest, ubuntu-latest, macos-latest]
30-
node: [14, 15]
25+
node: [14, 16]
3126
fail-fast: true
3227
steps:
3328
- uses: actions/checkout@v2
3429
- uses: actions/setup-node@v1
3530
with:
3631
node-version: ${{ matrix.node }}
3732
- run: npm install
38-
- run: npx nyc --reporter=lcov aegir test -t node -- --bail
33+
- run: npm run test:node -- -- --bail
3934
- uses: codecov/codecov-action@v1
4035
test-chrome:
4136
needs: check
4237
runs-on: ubuntu-latest
4338
steps:
4439
- uses: actions/checkout@v2
4540
- run: npm install
46-
- run: npx aegir test -t browser -t webworker --bail
41+
- run: npm run test:browser -- -- --bail
4742
test-firefox:
4843
needs: check
4944
runs-on: ubuntu-latest
5045
steps:
5146
- uses: actions/checkout@v2
5247
- run: npm install
53-
- run: npx aegir test -t browser -t webworker --bail -- --browsers FirefoxHeadless
48+
- run: npm run test:browser -- -- --bail -- --browser firefox

lerna.json

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
],
66
"version": "independent",
77
"command": {
8+
"bootstrap": {
9+
"hoist": true
10+
},
811
"run": {
912
"stream": true
1013
},

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"test:browser": "lerna run test:browser",
1313
"build": "lerna run build",
1414
"lint": "lerna run lint",
15+
"dep-check": "lerna run dep-check",
1516
"release": "lerna run build && lerna publish"
1617
},
1718
"bugs": "https://github.com/libp2p/js-libp2p-interfaces/issues",

packages/compliance-tests/package.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
},
1212
"scripts": {
1313
"lint": "aegir lint",
14+
"dep-check": "aegir dep-check",
15+
"test": "aegir test",
16+
"test:node": "aegir test --target node",
17+
"test:browser": "aegir test --target browser",
1418
"release": "aegir release --no-test",
1519
"release-minor": "aegir release --type minor --no-test",
1620
"release-major": "aegir release --type major --no-test"
@@ -39,7 +43,7 @@
3943
"it-goodbye": "^3.0.0",
4044
"it-pair": "^1.0.0",
4145
"it-pipe": "^1.1.0",
42-
"libp2p-interfaces": "../interfaces",
46+
"libp2p-interfaces": "^0.11.0",
4347
"multiaddr": "^9.0.1",
4448
"p-defer": "^3.0.0",
4549
"p-limit": "^3.1.0",
@@ -49,6 +53,9 @@
4953
"streaming-iterables": "^5.0.4",
5054
"uint8arrays": "^2.1.3"
5155
},
56+
"devDependencies": {
57+
"it-handshake": "^2.0.0"
58+
},
5259
"contributors": [
5360
"Alan Shaw <[email protected]>",
5461
"David Dias <[email protected]>",

packages/compliance-tests/src/stream-muxer/index.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
'use strict'
44

55
const baseTest = require('./base-test')
6+
const closeTest = require('./close-test')
67
const stressTest = require('./stress-test')
78
const megaStressTest = require('./mega-stress-test')
8-
const isNode = require('detect-node')
99

1010
module.exports = (common) => {
1111
describe('interface-stream-muxer', () => {
1212
baseTest(common)
13-
if (isNode) {
14-
const closeTest = require('./close-test')
15-
closeTest(common)
16-
}
13+
closeTest(common)
1714
stressTest(common)
1815
megaStressTest(common)
1916
})

packages/interfaces/test/connection/compliance.spec.js renamed to packages/compliance-tests/test/connection/index.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const tests = require('libp2p-interfaces-compliance-tests/src/connection')
5-
const { Connection } = require('../../src/connection')
6-
const peers = require('../utils/peers')
4+
const tests = require('../../src/connection')
5+
const { Connection } = require('libp2p-interfaces/src/connection')
6+
const peers = require('libp2p-interfaces/test/utils/peers')
77
const PeerId = require('peer-id')
88
const { Multiaddr } = require('multiaddr')
99
const pair = require('it-pair')

packages/interfaces/test/crypto/index.spec.js renamed to packages/compliance-tests/test/crypto/index.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const tests = require('libp2p-interfaces-compliance-tests/src/crypto')
4+
const tests = require('../../src/crypto')
55
const mockCrypto = require('./mock-crypto')
66

77
describe('compliance tests', () => {

packages/interfaces/test/peer-discovery/index.spec.js renamed to packages/compliance-tests/test/peer-discovery/index.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const tests = require('libp2p-interfaces-compliance-tests/src/peer-discovery')
4+
const tests = require('../../src/peer-discovery')
55
const MockDiscovery = require('./mock-discovery')
66

77
describe('compliance tests', () => {

packages/interfaces/test/topology/multicodec-topology.spec.js renamed to packages/compliance-tests/test/topology/multicodec-topology.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
const { EventEmitter } = require('events')
55

6-
const tests = require('libp2p-interfaces-compliance-tests/src/topology/multicodec-topology')
7-
const MulticodecTopology = require('../../src/topology/multicodec-topology')
6+
const tests = require('../../src/topology/multicodec-topology')
7+
const MulticodecTopology = require('libp2p-interfaces/src/topology/multicodec-topology')
88
const MockPeerStore = require('./mock-peer-store')
99

1010
describe('multicodec topology compliance tests', () => {

packages/interfaces/test/topology/topology.spec.js renamed to packages/compliance-tests/test/topology/topology.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const tests = require('libp2p-interfaces-compliance-tests/src/topology/topology')
5-
const Topology = require('../../src/topology')
4+
const tests = require('../../src/topology/topology')
5+
const Topology = require('libp2p-interfaces/src/topology')
66

77
describe('topology compliance tests', () => {
88
tests({

packages/interfaces/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"scripts": {
2525
"lint": "aegir lint",
26+
"dep-check": "aegir dep-check",
2627
"build": "npm run build:proto && npm run build:proto-types && npm run build:types",
2728
"build:types": "aegir build --no-bundle",
2829
"build:proto": "npm run build:proto:rpc && npm run build:proto:topic-descriptor",
@@ -73,9 +74,7 @@
7374
"aegir": "^33.0.0",
7475
"cids": "^1.1.6",
7576
"events": "^3.3.0",
76-
"it-handshake": "^2.0.0",
7777
"it-pair": "^1.0.0",
78-
"libp2p-interfaces-compliance-tests": "../compliance-tests",
7978
"p-wait-for": "^3.2.0",
8079
"rimraf": "^3.0.2",
8180
"sinon": "^10.0.0",

packages/interfaces/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./node_modules/aegir/src/config/tsconfig.aegir.json",
2+
"extends": "aegir/src/config/tsconfig.aegir.json",
33
"compilerOptions": {
44
"outDir": "dist"
55
},

0 commit comments

Comments
 (0)