fix: disable dht by default #338 (#339)

fix: correct transport config check
This commit is contained in:
Jacob Heun 2019-03-20 09:12:02 +01:00 committed by GitHub
parent da52af704e
commit e52ce66ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions

View File

@ -29,7 +29,11 @@ const optionsSchema = s(
peerDiscovery: optional(list([s('object|function')])), peerDiscovery: optional(list([s('object|function')])),
peerRouting: optional(list(['object'])), peerRouting: optional(list(['object'])),
streamMuxer: optional(list([s('object|function')])), streamMuxer: optional(list([s('object|function')])),
transport: list([transport]) transport: s.intersection([[transport], s.interface({
length (v) {
return v > 0 ? true : 'ERROR_EMPTY'
}
})])
}), }),
config: s({ config: s({
peerDiscovery: 'object?', peerDiscovery: 'object?',
@ -52,7 +56,7 @@ const optionsSchema = s(
}, { enabled: false, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })), }, { enabled: false, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })),
validators: 'object?', validators: 'object?',
selectors: 'object?' selectors: 'object?'
}, { enabled: true, kBucketSize: 20, enabledDiscovery: true }), }, { enabled: false, kBucketSize: 20, enabledDiscovery: false }),
EXPERIMENTAL: s({ EXPERIMENTAL: s({
pubsub: 'boolean' pubsub: 'boolean'
}, { pubsub: false }) }, { pubsub: false })

View File

@ -55,7 +55,7 @@ describe('configuration', () => {
transport: [ ] transport: [ ]
} }
}) })
}).to.throw() }).to.throw('ERROR_EMPTY')
}) })
it('should add defaults to missing items', () => { it('should add defaults to missing items', () => {
@ -95,7 +95,7 @@ describe('configuration', () => {
}, },
dht: { dht: {
kBucketSize: 20, kBucketSize: 20,
enabled: true, enabled: false,
randomWalk: { randomWalk: {
enabled: false, enabled: false,
queriesPerPeriod: 1, queriesPerPeriod: 1,
@ -152,8 +152,8 @@ describe('configuration', () => {
transport: [ WS ] transport: [ WS ]
}, },
config: { config: {
EXPERIMENTAL: { dht: {
dht: true enabled: true
} }
} }
} }
@ -197,7 +197,7 @@ describe('configuration', () => {
}, },
dht: { dht: {
kBucketSize: 20, kBucketSize: 20,
enabled: true, enabled: false,
randomWalk: { randomWalk: {
enabled: false, enabled: false,
queriesPerPeriod: 1, queriesPerPeriod: 1,