Skip to content

Commit

Permalink
feat: remove secio support
Browse files Browse the repository at this point in the history
Secio has now been completely deprecated and support has been removed
from the go-libp2p daemon (in master).
  • Loading branch information
Stebalien authored and vasco-santos committed May 4, 2021
1 parent 45e5062 commit 64823d6
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 22 deletions.
2 changes: 1 addition & 1 deletion pdd/PDD-THE-IPFS-BUNDLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Node extends libp2p {
Yamux
],
crypto: [
SECIO
Noise
// TLS 1.3 (Soon™)
]
},
Expand Down
2 changes: 0 additions & 2 deletions src/daemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,13 @@ class Daemon {
// we need to be in dht server mode for testing
execOptions = ['-listen', addr, '-hostAddrs=/ip4/0.0.0.0/tcp/0,/ip4/0.0.0.0/udp/0/quic']

execOptions.push(`-secio=${options.secio}`)
execOptions.push(`-noise=${options.noise}`)
options.dht && execOptions.push('-dhtServer')
options.pubsub && execOptions.push('-pubsub')
options.pubsubRouter && execOptions.push('-pubsubRouter', options.pubsubRouter)
} else {
execOptions = ['--listen', addr, '-hostAddrs=/ip4/0.0.0.0/tcp/0']

execOptions.push(`--secio=${options.secio}`)
execOptions.push(`--noise=${options.noise}`)
options.dht && execOptions.push('--dht')
options.pubsub && execOptions.push('--pubsub')
Expand Down
1 change: 0 additions & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ exports.getMultiaddr = (sockPath, port) => isWindows
: ma(`/unix${path.resolve(os.tmpdir(), sockPath)}`)

exports.DEFAULT_CONFIG = {
secio: false,
noise: true,
dht: false
}
8 changes: 2 additions & 6 deletions test/connect/ed25519/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
'use strict'

// SECIO
require('./go2js')('secio', { secio: true, noise: false })
require('./js2go')('secio', { secio: true, noise: false })

// NOISE
require('./go2js')('noise', { secio: false, noise: true })
require('./js2go')('noise', { secio: false, noise: true })
require('./go2js')('noise', { noise: true })
require('./js2go')('noise', { noise: true })
8 changes: 2 additions & 6 deletions test/connect/rsa/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
'use strict'

// SECIO
require('./go2js')('secio', { secio: true, noise: false })
require('./js2go')('secio', { secio: true, noise: false })

// NOISE
require('./go2js')('noise', { secio: false, noise: true })
require('./js2go')('noise', { secio: false, noise: true })
require('./go2js')('noise', { noise: true })
require('./js2go')('noise', { noise: true })
8 changes: 2 additions & 6 deletions test/connect/secp256k1/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
'use strict'

// SECIO
require('./go2js')('secio', { secio: true, noise: false })
require('./js2go')('secio', { secio: true, noise: false })

// NOISE
require('./go2js')('noise', { secio: false, noise: true })
require('./js2go')('noise', { secio: false, noise: true })
require('./go2js')('noise', { noise: true })
require('./js2go')('noise', { noise: true })

0 comments on commit 64823d6

Please sign in to comment.