Mirroristas/orbitdb
2
0
Fork 0
mirror of https://github.com/orbitdb/orbitdb.git synced 2025-05-21 22:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from orbitdb/fix/remove-stop-ipfs

Browse Source 
Remove stopIpfs() function and use ipfs.stop()
This commit is contained in:
Haad 2017-12-06 08:23:47 +01:00 committed by GitHub
commit b09a5cd767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/counterdb.test.js
View File

@ -34,10 +34,10 @@ describe('CounterStore', function() {
after(async () => { after(async () => {
if (orbitdb1) if (orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if (orbitdb2) if (orbitdb2)
orbitdb2.stop() await orbitdb2.stop()
if (ipfs1) if (ipfs1)
await ipfs1.stop() await ipfs1.stop()

3
test/create-open.test.js
View File

@ -10,7 +10,6 @@ const OrbitDBAddress = require('../src/orbit-db-address')
const { first, last } = require('./utils/test-utils') const { first, last } = require('./utils/test-utils')
const config = require('./utils/config') const config = require('./utils/config')
const startIpfs = require('./utils/start-ipfs') const startIpfs = require('./utils/start-ipfs')
const stopIpfs = require('./utils/stop-ipfs')
const dbPath = './orbitdb/tests/create-open' const dbPath = './orbitdb/tests/create-open'
const ipfsPath = './orbitdb/tests/create-open/ipfs' const ipfsPath = './orbitdb/tests/create-open/ipfs'
@ -34,7 +33,7 @@ describe('orbit-db - Create & Open', function() {
orbitdb.stop() orbitdb.stop()
if (ipfs) if (ipfs)
await stopIpfs(ipfs) await ipfs.stop()
}) })
describe('Create', function() { describe('Create', function() {

6
test/docstore.test.js
View File

@ -21,12 +21,12 @@ describe('orbit-db - Document Store', function() {
orbitdb1 = new OrbitDB(ipfs, dbPath + '/1') orbitdb1 = new OrbitDB(ipfs, dbPath + '/1')
}) })
after(() => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.disconnect() await orbitdb1.stop()
if (ipfs) if (ipfs)
ipfs.stop() await ipfs.stop()
}) })
it('creates and opens a database', async () => { it('creates and opens a database', async () => {

2
test/eventlog.test.js
View File

@ -27,7 +27,7 @@ describe('orbit-db - Eventlog', function() {
after(async () => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if (ipfs) if (ipfs)
await ipfs.stop() await ipfs.stop()

2
test/feed.test.js
View File

@ -27,7 +27,7 @@ describe('orbit-db - Feed', function() {
after(async () => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if (ipfs) if (ipfs)
await ipfs.stop() await ipfs.stop()

2
test/kvstore.test.js
View File

@ -24,7 +24,7 @@ describe('orbit-db - Key-Value Store', function() {
after(async () => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if (ipfs) if (ipfs)
await ipfs.stop() await ipfs.stop()

5
test/multiple-databases.test.js
View File

@ -6,7 +6,6 @@ const rmrf = require('rimraf')
const OrbitDB = require('../src/OrbitDB') const OrbitDB = require('../src/OrbitDB')
const config = require('./utils/config') const config = require('./utils/config')
const startIpfs = require('./utils/start-ipfs') const startIpfs = require('./utils/start-ipfs')
const stopIpfs = require('./utils/stop-ipfs')
const waitForPeers = require('./utils/wait-for-peers') const waitForPeers = require('./utils/wait-for-peers')
const dbPath1 = './orbitdb/tests/multiple-databases/1' const dbPath1 = './orbitdb/tests/multiple-databases/1'
@ -83,10 +82,10 @@ describe('orbit-db - Multiple Databases', function() {
await orbitdb2.stop() await orbitdb2.stop()
if (ipfs1) if (ipfs1)
await stopIpfs(ipfs1) await ipfs1.stop()
if (ipfs2) if (ipfs2)
await stopIpfs(ipfs2) await ipfs2.stop()
}) })
beforeEach(async () => { beforeEach(async () => {

2
test/persistency.js
View File

@ -27,7 +27,7 @@ describe('orbit-db - Persistency', function() {
after(async () => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if (ipfs) if (ipfs)
await ipfs.stop() await ipfs.stop()

5
test/replicate-and-load.test.js
View File

@ -6,7 +6,6 @@ const rmrf = require('rimraf')
const OrbitDB = require('../src/OrbitDB') const OrbitDB = require('../src/OrbitDB')
const config = require('./utils/config') const config = require('./utils/config')
const startIpfs = require('./utils/start-ipfs') const startIpfs = require('./utils/start-ipfs')
const stopIpfs = require('./utils/stop-ipfs')
const waitForPeers = require('./utils/wait-for-peers') const waitForPeers = require('./utils/wait-for-peers')
const dbPath1 = './orbitdb/tests/replicate-and-load/1' const dbPath1 = './orbitdb/tests/replicate-and-load/1'
@ -43,10 +42,10 @@ describe('orbit-db - Replicate and Load', function() {
await orbitdb2.stop() await orbitdb2.stop()
if (ipfs1) if (ipfs1)
await stopIpfs(ipfs1) await ipfs1.stop()
if (ipfs2) if (ipfs2)
await stopIpfs(ipfs2) await ipfs2.stop()
}) })
describe('two peers', function() { describe('two peers', function() {

5
test/replicate-automatically.test.js
View File

@ -6,7 +6,6 @@ const rmrf = require('rimraf')
const OrbitDB = require('../src/OrbitDB') const OrbitDB = require('../src/OrbitDB')
const config = require('./utils/config') const config = require('./utils/config')
const startIpfs = require('./utils/start-ipfs') const startIpfs = require('./utils/start-ipfs')
const stopIpfs = require('./utils/stop-ipfs')
const waitForPeers = require('./utils/wait-for-peers') const waitForPeers = require('./utils/wait-for-peers')
const dbPath1 = './orbitdb/tests/replicate-automatically/1' const dbPath1 = './orbitdb/tests/replicate-automatically/1'
@ -43,10 +42,10 @@ describe('orbit-db - Automatic Replication', function() {
await orbitdb2.stop() await orbitdb2.stop()
if (ipfs1) if (ipfs1)
await stopIpfs(ipfs1) await ipfs1.stop()
if (ipfs2) if (ipfs2)
await stopIpfs(ipfs2) await ipfs2.stop()
}) })
beforeEach(async () => { beforeEach(async () => {

5
test/replicate.test.js
View File

@ -6,7 +6,6 @@ const rmrf = require('rimraf')
const OrbitDB = require('../src/OrbitDB') const OrbitDB = require('../src/OrbitDB')
const config = require('./utils/config') const config = require('./utils/config')
const startIpfs = require('./utils/start-ipfs') const startIpfs = require('./utils/start-ipfs')
const stopIpfs = require('./utils/stop-ipfs')
const waitForPeers = require('./utils/wait-for-peers') const waitForPeers = require('./utils/wait-for-peers')
const dbPath1 = './orbitdb/tests/replication/1' const dbPath1 = './orbitdb/tests/replication/1'
@ -43,10 +42,10 @@ describe('orbit-db - Replication', function() {
await orbitdb2.stop() await orbitdb2.stop()
if (ipfs1) if (ipfs1)
await stopIpfs(ipfs1) await ipfs1.stop()
if (ipfs2) if (ipfs2)
await stopIpfs(ipfs2) await ipfs2.stop()
}) })
describe('two peers', function() { describe('two peers', function() {

23
test/utils/stop-ipfs.js
View File

@ -1,23 +0,0 @@
'use strict'
const IPFS = require('ipfs')
/**
* Stop an IPFS instance
* @param {[IPFS]} ipfs [IPFS instance to stop]
* @return {[Promise]} [Empty]
*/
const stopIpfs = (ipfs) => {
return new Promise((resolve, reject) => {
// TODO: ipfs.stop() should return a Promise, PR it in github/js-ipfs
ipfs.stop((err) => {
if (err) {
reject(err)
} else {
resolve()
}
})
})
}
module.exports = stopIpfs

4
test/write-permissions.test.js
View File

@ -68,10 +68,10 @@ describe('orbit-db - Write Permissions', function() {
after(async () => { after(async () => {
if(orbitdb1) if(orbitdb1)
orbitdb1.stop() await orbitdb1.stop()
if(orbitdb2) if(orbitdb2)
orbitdb2.stop() await orbitdb2.stop()
if (ipfs) if (ipfs)
await ipfs.stop() await ipfs.stop()