Skip to content

Commit b3deb35

Browse files
authored
fix: reference files directly to avoid npm install failures (#408)
1 parent 299cfef commit b3deb35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+49
-85
lines changed

.aegir.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const PeerBook = require('peer-book')
1010
const PeerId = require('peer-id')
1111
const PeerInfo = require('peer-info')
1212
const path = require('path')
13-
const Switch = require('libp2p-switch')
13+
const Switch = require('./src/switch')
1414
const WebSockets = require('libp2p-websockets')
1515

1616
const Node = require('./test/utils/bundle-nodejs.js')

package.json

-6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,7 @@
5353
"hashlru": "^2.3.0",
5454
"interface-connection": "~0.3.3",
5555
"latency-monitor": "~0.2.1",
56-
"libp2p-circuit": "./src/circuit",
57-
"libp2p-connection-manager": "./src/connection-manager",
5856
"libp2p-crypto": "~0.16.1",
59-
"libp2p-identify": "./src/identify",
60-
"libp2p-ping": "./src/ping",
61-
"libp2p-pnet": "./src/pnet",
62-
"libp2p-switch": "./src/switch",
6357
"libp2p-websockets": "^0.12.2",
6458
"mafmt": "^6.0.7",
6559
"moving-average": "^1.0.0",

src/circuit/package.json

-5
This file was deleted.

src/connection-manager/package.json

-5
This file was deleted.

src/identify/package.json

-5
This file was deleted.

src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const nextTick = require('async/nextTick')
1515

1616
const PeerBook = require('peer-book')
1717
const PeerInfo = require('peer-info')
18-
const Switch = require('libp2p-switch')
19-
const Ping = require('libp2p-ping')
18+
const Switch = require('./switch')
19+
const Ping = require('./ping')
2020
const WebSockets = require('libp2p-websockets')
21-
const ConnectionManager = require('libp2p-connection-manager')
21+
const ConnectionManager = require('./connection-manager')
2222

2323
const { emitFirst } = require('./util')
2424
const peerRouting = require('./peer-routing')

src/ping/package.json

-5
This file was deleted.

src/pnet/package.json

-5
This file was deleted.

src/switch/connection/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
'use strict'
22

33
const FSM = require('fsm-event')
4-
const Circuit = require('libp2p-circuit')
4+
const Circuit = require('../../circuit')
55
const multistream = require('multistream-select')
66
const withIs = require('class-is')
77
const BaseConnection = require('./base')
88
const parallel = require('async/parallel')
99
const nextTick = require('async/nextTick')
10-
const identify = require('libp2p-identify')
10+
const identify = require('../../identify')
1111
const errCode = require('err-code')
1212
const { msHandle, msSelect, identifyDialer } = require('../utils')
1313

src/switch/connection/manager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use strict'
22

3-
const identify = require('libp2p-identify')
3+
const identify = require('../../identify')
44
const multistream = require('multistream-select')
55
const debug = require('debug')
66
const log = debug('libp2p:switch:conn-manager')
77
const once = require('once')
88
const ConnectionFSM = require('../connection')
99
const { msHandle, msSelect, identifyDialer } = require('../utils')
1010

11-
const Circuit = require('libp2p-circuit')
11+
const Circuit = require('../../circuit')
1212

1313
const plaintext = require('../plaintext')
1414

src/switch/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const EventEmitter = require('events').EventEmitter
55
const each = require('async/each')
66
const eachSeries = require('async/eachSeries')
77
const series = require('async/series')
8-
const Circuit = require('libp2p-circuit')
8+
const Circuit = require('../circuit')
99
const TransportManager = require('./transport')
1010
const ConnectionManager = require('./connection/manager')
1111
const { getPeerInfo } = require('../get-peer-info')

src/switch/package.json

-5
This file was deleted.

src/switch/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const Identify = require('libp2p-identify')
3+
const Identify = require('../identify')
44

55
/**
66
* For a given multistream, registers to handle the given connection

test/circuit-relay.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const sinon = require('sinon')
88
const waterfall = require('async/waterfall')
99
const series = require('async/series')
1010
const parallel = require('async/parallel')
11-
const Circuit = require('libp2p-circuit')
11+
const Circuit = require('../src/circuit')
1212
const multiaddr = require('multiaddr')
1313

1414
const createNode = require('./utils/create-node')

test/connection-manager/utils/create-libp2p-node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const waterfall = require('async/waterfall')
88
const PeerInfo = require('peer-info')
99
const PeerId = require('peer-id')
1010

11-
const ConnManager = require('libp2p-connection-manager')
11+
const ConnManager = require('../../../src/connection-manager')
1212

1313
class Node extends libp2p {
1414
constructor (peerInfo) {

test/identify/basic.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const dirtyChai = require('dirty-chai')
66
const expect = chai.expect
77
chai.use(dirtyChai)
88

9-
const identify = require('libp2p-identify')
9+
const identify = require('../../src/identify')
1010

1111
describe('basic', () => {
1212
it('multicodec', () => {

test/identify/dialer.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const PeerInfo = require('peer-info')
1212
const lp = require('pull-length-prefixed')
1313
const multiaddr = require('multiaddr')
1414

15-
const msg = require('libp2p-identify').message
16-
const identify = require('libp2p-identify')
15+
const identify = require('../../src/identify')
16+
const msg = identify.message
1717

1818
describe('identify.dialer', () => {
1919
let original

test/identify/listener.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const PeerInfo = require('peer-info')
1212
const lp = require('pull-length-prefixed')
1313
const multiaddr = require('multiaddr')
1414

15-
const msg = require('libp2p-identify').message
16-
const identify = require('libp2p-identify')
15+
const identify = require('../../src/identify')
16+
const msg = identify.message
1717

1818
describe('identify.listener', () => {
1919
let info

test/ping/test-ping.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ chai.use(dirtyChai)
88
const PeerInfo = require('peer-info')
99
const PeerBook = require('peer-book')
1010

11-
const Swarm = require('libp2p-switch')
11+
const Swarm = require('../../src/switch')
1212
const TCP = require('libp2p-tcp')
1313
const series = require('async/series')
1414
const parallel = require('async/parallel')
1515

16-
const Ping = require('libp2p-ping')
16+
const Ping = require('../../src/ping')
1717

1818
describe('libp2p ping', () => {
1919
let swarmA

test/pnet/pnet.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Connection = require('interface-connection').Connection
1212
const pair = require('pull-pair/duplex')
1313
const pull = require('pull-stream')
1414

15-
const Protector = require('libp2p-pnet')
15+
const Protector = require('../../src/pnet')
1616
const Errors = Protector.errors
1717
const generate = Protector.generate
1818

test/promisify.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const createNode = promisify(require('./utils/create-node'))
1616
const { createPeerInfo } = require('./utils/create-node')
1717
const Node = require('./utils/bundle-nodejs')
1818
const pull = require('pull-stream')
19-
const Ping = require('libp2p-ping')
19+
const Ping = require('../src/ping')
2020

2121
/**
2222
* As libp2p is currently promisified, when extending libp2p,

test/switch/connection.node.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ const secio = require('libp2p-secio')
1313
const pull = require('pull-stream')
1414
const multiplex = require('pull-mplex')
1515
const spdy = require('libp2p-spdy')
16-
const Protector = require('libp2p-pnet')
16+
const Protector = require('../../src/pnet')
1717
const generatePSK = Protector.generate
1818

1919
const psk = Buffer.alloc(95)
2020
generatePSK(psk)
2121

22-
const ConnectionFSM = require('libp2p-switch/connection')
23-
const Switch = require('libp2p-switch')
22+
const ConnectionFSM = require('../../src/switch/connection')
23+
const Switch = require('../../src/switch')
2424
const createInfos = require('./utils').createInfos
2525

2626
describe('ConnectionFSM', () => {

test/switch/constructor.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const dirtyChai = require('dirty-chai')
66
const expect = chai.expect
77
chai.use(dirtyChai)
88

9-
const Switch = require('libp2p-switch')
9+
const Switch = require('../../src/switch')
1010

1111
describe('create Switch instance', () => {
1212
it('throws on missing peerInfo', () => {

test/switch/dial-fsm.node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ const TCP = require('libp2p-tcp')
1616
const secio = require('libp2p-secio')
1717
const multiplex = require('pull-mplex')
1818
const pull = require('pull-stream')
19-
const identify = require('libp2p-identify')
19+
const identify = require('../../src/identify')
2020

2121
const utils = require('./utils')
2222
const createInfos = utils.createInfos
23-
const Switch = require('libp2p-switch')
23+
const Switch = require('../../src/switch')
2424

2525
describe('dialFSM', () => {
2626
let switchA

test/switch/dialSelf.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Duplex = require('pull-pair/duplex')
1313

1414
const utils = require('./utils')
1515
const createInfos = utils.createInfos
16-
const Swarm = require('libp2p-switch')
16+
const Swarm = require('../../src/switch')
1717

1818
class MockTransport extends EventEmitter {
1919
constructor () {

test/switch/dialer.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ chai.use(dirtyChai)
99
const sinon = require('sinon')
1010

1111
const PeerBook = require('peer-book')
12-
const Queue = require('libp2p-switch/dialer/queue')
13-
const QueueManager = require('libp2p-switch/dialer/queueManager')
14-
const Switch = require('libp2p-switch')
15-
const { PRIORITY_HIGH, PRIORITY_LOW } = require('libp2p-switch/constants')
12+
const Queue = require('../../src/switch/dialer/queue')
13+
const QueueManager = require('../../src/switch/dialer/queueManager')
14+
const Switch = require('../../src/switch')
15+
const { PRIORITY_HIGH, PRIORITY_LOW } = require('../../src/switch/constants')
1616

1717
const utils = require('./utils')
1818
const createInfos = utils.createInfos

test/switch/identify.node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ const pull = require('pull-stream')
1212
const secio = require('libp2p-secio')
1313
const PeerInfo = require('peer-info')
1414
const PeerBook = require('peer-book')
15-
const identify = require('libp2p-identify')
15+
const identify = require('../../src/identify')
1616
const lp = require('pull-length-prefixed')
1717
const sinon = require('sinon')
1818

1919
const utils = require('./utils')
2020
const createInfos = utils.createInfos
21-
const Switch = require('libp2p-switch')
21+
const Switch = require('../../src/switch')
2222

2323
describe('Identify', () => {
2424
let switchA

test/switch/limit-dialer.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const multiaddr = require('multiaddr')
99
const pull = require('pull-stream')
1010
const nextTick = require('async/nextTick')
1111

12-
const LimitDialer = require('libp2p-switch/limit-dialer')
12+
const LimitDialer = require('../../src/switch/limit-dialer')
1313
const utils = require('./utils')
1414

1515
describe('LimitDialer', () => {

test/switch/pnet.node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ const multiplex = require('pull-mplex')
1111
const pull = require('pull-stream')
1212
const PeerBook = require('peer-book')
1313
const secio = require('libp2p-secio')
14-
const Protector = require('libp2p-pnet')
14+
const Protector = require('../../src/pnet')
1515

1616
const utils = require('./utils')
1717
const createInfos = utils.createInfos
1818
const tryEcho = utils.tryEcho
19-
const Switch = require('libp2p-switch')
19+
const Switch = require('../../src/switch')
2020

2121
const generatePSK = Protector.generate
2222

test/switch/secio.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const PeerBook = require('peer-book')
1515
const utils = require('./utils')
1616
const createInfos = utils.createInfos
1717
const tryEcho = utils.tryEcho
18-
const Switch = require('libp2p-switch')
18+
const Switch = require('../../src/switch')
1919

2020
describe('SECIO', () => {
2121
let switchA

test/switch/stats.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const PeerBook = require('peer-book')
1818
const utils = require('./utils')
1919
const createInfos = utils.createInfos
2020
const tryEcho = utils.tryEcho
21-
const Switch = require('libp2p-switch')
21+
const Switch = require('../../src/switch')
2222

2323
describe('Stats', () => {
2424
const setup = (cb) => {

test/switch/stream-muxers.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const utils = require('./utils')
1818
const createInfos = utils.createInfos
1919
const tryEcho = utils.tryEcho
2020

21-
const Switch = require('libp2p-switch')
21+
const Switch = require('../../src/switch')
2222

2323
describe('Stream Multiplexing', () => {
2424
[

test/switch/swarm-muxing+webrtc-star.browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const PeerBook = require('peer-book')
1717
const tryEcho = require('./utils').tryEcho
1818
const sinon = require('sinon')
1919

20-
const Switch = require('libp2p-switch')
20+
const Switch = require('../../src/switch')
2121

2222
describe('Switch (webrtc-star)', () => {
2323
let switch1

test/switch/swarm-muxing+websockets.browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const spdy = require('libp2p-spdy')
1515
const PeerBook = require('peer-book')
1616
const tryEcho = require('./utils').tryEcho
1717

18-
const Switch = require('libp2p-switch')
18+
const Switch = require('../../src/switch')
1919

2020
describe('Switch (WebSockets)', () => {
2121
[

test/switch/swarm-muxing.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const PeerBook = require('peer-book')
1919
const utils = require('./utils')
2020
const createInfos = utils.createInfos
2121
const tryEcho = utils.tryEcho
22-
const Switch = require('libp2p-switch')
22+
const Switch = require('../../src/switch')
2323

2424
describe('Switch (everything all together)', () => {
2525
[pMplex, spdy, mplex].forEach(muxer => {

test/switch/swarm-no-muxing.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const PeerBook = require('peer-book')
1414
const utils = require('./utils')
1515
const createInfos = utils.createInfos
1616
const tryEcho = utils.tryEcho
17-
const Switch = require('libp2p-switch')
17+
const Switch = require('../../src/switch')
1818

1919
describe('Switch (no Stream Multiplexing)', () => {
2020
let switchA

test/switch/switch.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const dirtyChai = require('dirty-chai')
66
const expect = chai.expect
77
chai.use(dirtyChai)
88

9-
const Switch = require('libp2p-switch')
9+
const Switch = require('../../src/switch')
1010

1111
describe('Switch', () => {
1212
describe('.availableTransports', () => {

test/switch/t-webrtc-star.browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const pull = require('pull-stream')
1313
const PeerBook = require('peer-book')
1414
const tryEcho = require('./utils').tryEcho
1515

16-
const Switch = require('libp2p-switch')
16+
const Switch = require('../../src/switch')
1717

1818
describe('transport - webrtc-star', () => {
1919
let switch1

test/switch/transport-manager.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Multiaddr = require('multiaddr')
99
const PeerInfo = require('peer-info')
1010
const sinon = require('sinon')
1111

12-
const TransportManager = require('libp2p-switch/transport')
12+
const TransportManager = require('../../src/switch/transport')
1313

1414
describe('Transport Manager', () => {
1515
afterEach(() => {

0 commit comments

Comments
 (0)