Mirroristas/orbitdb
2
0
Fork 0
mirror of https://github.com/orbitdb/orbitdb.git synced 2025-07-08 13:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #685 from achingbrain/upgrade-to-js-ipfs-0.38.x-rc

Browse Source 
Upgrade to js-IPFS v0.38.x-rc
This commit is contained in:
Mark Robert Henderson 2019-09-30 12:11:25 -04:00 committed by GitHub
commit e575fbba97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -43,7 +43,8 @@
"datastore-level": "0.10.0", "datastore-level": "0.10.0",
"fs-extra": "^7.0.1", "fs-extra": "^7.0.1",
"go-ipfs-dep": "aphelionz/npm-go-ipfs-dep", "go-ipfs-dep": "aphelionz/npm-go-ipfs-dep",
"ipfs": "~0.36.4", "ipfs": "0.38.0-rc.4",
"ipfs-http-client": "^37.0.1",
"ipfs-repo": "~0.26.6", "ipfs-repo": "~0.26.6",
"ipfsd-ctl": "~0.42.3", "ipfsd-ctl": "~0.42.3",
"localstorage-level-migration": "next", "localstorage-level-migration": "next",

9
test/utils/config.js
View File

@ -3,9 +3,6 @@ module.exports = {
dbname: 'orbit-db-tests', dbname: 'orbit-db-tests',
defaultIpfsConfig: { defaultIpfsConfig: {
start: true, start: true,
EXPERIMENTAL: {
pubsub: true
},
config: { config: {
Addresses: { Addresses: {
API: '/ip4/127.0.0.1/tcp/0', API: '/ip4/127.0.0.1/tcp/0',
@ -25,9 +22,6 @@ module.exports = {
} }
}, },
daemon1: { daemon1: {
EXPERIMENTAL: {
pubsub: true
},
config: { config: {
Addresses: { Addresses: {
API: '/ip4/127.0.0.1/tcp/0', API: '/ip4/127.0.0.1/tcp/0',
@ -47,9 +41,6 @@ module.exports = {
}, },
}, },
daemon2: { daemon2: {
EXPERIMENTAL: {
pubsub: true
},
config: { config: {
Addresses: { Addresses: {
API: '/ip4/127.0.0.1/tcp/0', API: '/ip4/127.0.0.1/tcp/0',

2
test/utils/start-ipfs.js
View File

@ -15,7 +15,7 @@ const startIpfs = (type, config = {}) => {
} }
// If we're starting a process, pass command line arguments to it // If we're starting a process, pass command line arguments to it
if (!config.args) { if (!config.args && type.includes('go')) {
config.args = ['--enable-pubsub-experiment'] config.args = ['--enable-pubsub-experiment']
} }

4
test/utils/test-apis.js
View File

@ -1,4 +1,5 @@
const IPFS = require('ipfs') const IPFS = require('ipfs')
const IPFSHTTPClient = require('ipfs-http-client')
/** /**
* IPFS daemons to run the tests with. * IPFS daemons to run the tests with.
@ -8,7 +9,7 @@ const IPFS = require('ipfs')
// https://github.com/ipfs/js-ipfsd-ctl#ipfsfactory---const-f--ipfsfactorycreateoptions // https://github.com/ipfs/js-ipfsd-ctl#ipfsfactory---const-f--ipfsfactorycreateoptions
let jsIpfs = { let jsIpfs = {
'js-ipfs': { 'js-ipfs': {
type: 'proc', type: 'proc',
exec: IPFS, exec: IPFS,
} }
} }
@ -16,6 +17,7 @@ let jsIpfs = {
const goIpfs = { const goIpfs = {
'go-ipfs': { 'go-ipfs': {
type: 'go', type: 'go',
IpfsClient: IPFSHTTPClient,
} }
} }