Skip to content

Commit

Permalink
Reversting lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
aphelionz committed May 31, 2019
1 parent a50b4f3 commit 4226921
Show file tree
Hide file tree
Showing 40 changed files with 542 additions and 426 deletions.
19 changes: 10 additions & 9 deletions benchmarks/benchmark-add-go-ipfs.js
Expand Up @@ -12,14 +12,14 @@ let lastTenSeconds = 0
// Main loop
const queryLoop = async (db) => {
await db.add(totalQueries)
totalQueries++
lastTenSeconds++
queriesPerSecond++
totalQueries ++
lastTenSeconds ++
queriesPerSecond ++
setImmediate(() => queryLoop(db))
}

// Start
console.log('Starting...')
console.log("Starting...")

// Make sure you have a local IPFS daemon running!
const ipfs = IPFS('127.0.0.1')
Expand All @@ -28,15 +28,16 @@ const run = async () => {
try {
const orbit = await OrbitDB.createInstance(ipfs, { directory: './orbitdb/benchmarks' })
const db = await orbit.eventlog('orbit-db.benchmark', {
replicate: false
replicate: false,
})

// Metrics output
setInterval(() => {
seconds++
if (seconds % 10 === 0) {
console.log(`--> Average of ${lastTenSeconds / 10} q/s in the last 10 seconds`)
if (lastTenSeconds === 0) { throw new Error('Problems!') }
seconds ++
if(seconds % 10 === 0) {
console.log(`--> Average of ${lastTenSeconds/10} q/s in the last 10 seconds`)
if(lastTenSeconds === 0)
throw new Error("Problems!")
lastTenSeconds = 0
}
console.log(`${queriesPerSecond} queries per second, ${totalQueries} queries in ${seconds} seconds (Oplog: ${db._oplog.length})`)
Expand Down
29 changes: 15 additions & 14 deletions benchmarks/benchmark-add.js
Expand Up @@ -14,19 +14,19 @@ let lastTenSeconds = 0
// Main loop
const queryLoop = async (db) => {
await db.add(totalQueries)
totalQueries++
lastTenSeconds++
queriesPerSecond++
totalQueries ++
lastTenSeconds ++
queriesPerSecond ++
setImmediate(() => queryLoop(db))
}

// Start
console.log('Starting IPFS daemon...')
console.log("Starting IPFS daemon...")

const repoConf = {
storageBackends: {
blocks: DatastoreLevel
}
blocks: DatastoreLevel,
},
}

const ipfs = new IPFS({
Expand All @@ -35,26 +35,27 @@ const ipfs = new IPFS({
EXPERIMENTAL: {
pubsub: false,
sharding: false,
dht: false
}
dht: false,
},
})

ipfs.on('error', (err) => console.error(err))

ipfs.on('ready', async () => {
const run = async () => {
try {
const orbit = await OrbitDB.createInstance(ipfs, { directory: './orbitdb/benchmarks' })
const orbit = await OrbitDB.createInstance(ipfs,{ directory: './orbitdb/benchmarks' })
const db = await orbit.eventlog('orbit-db.benchmark', {
replicate: false
replicate: false,
})

// Metrics output
setInterval(() => {
seconds++
if (seconds % 10 === 0) {
console.log(`--> Average of ${lastTenSeconds / 10} q/s in the last 10 seconds`)
if (lastTenSeconds === 0) { throw new Error('Problems!') }
seconds ++
if(seconds % 10 === 0) {
console.log(`--> Average of ${lastTenSeconds/10} q/s in the last 10 seconds`)
if(lastTenSeconds === 0)
throw new Error("Problems!")
lastTenSeconds = 0
}
console.log(`${queriesPerSecond} queries per second, ${totalQueries} queries in ${seconds} seconds (Oplog: ${db._oplog.length})`)
Expand Down
40 changes: 20 additions & 20 deletions benchmarks/benchmark-replication-sender.js
Expand Up @@ -12,7 +12,7 @@ let metrics1 = {
totalQueries: 0,
seconds: 0,
queriesPerSecond: 0,
lastTenSeconds: 0
lastTenSeconds: 0,
}

const ipfsConf = {
Expand All @@ -26,22 +26,22 @@ const ipfsConf = {
MDNS: {
Enabled: true,
Interval: 1
}
}
},
},
}

const repoConf = {
storageBackends: {
blocks: DatastoreLevel
}
blocks: DatastoreLevel,
},
}

const defaultConfig = Object.assign({}, {
start: true,
EXPERIMENTAL: {
pubsub: true,
sharding: false,
dht: false
dht: false,
},
config: ipfsConf
})
Expand All @@ -56,34 +56,34 @@ const queryLoop = async (db) => {
try {
await db.add(metrics1.totalQueries)
} catch (e) {
console.error(e)
console.error(e)
}
metrics1.totalQueries++
metrics1.lastTenSeconds++
metrics1.queriesPerSecond++
metrics1.totalQueries ++
metrics1.lastTenSeconds ++
metrics1.queriesPerSecond ++
setImmediate(() => queryLoop(db))
}
}

// Metrics output function
const outputMetrics = (name, db, metrics) => {
metrics.seconds++
console.log(`[${name}] ${metrics.queriesPerSecond} queries per second, ${metrics.totalQueries} queries in ${metrics.seconds} seconds (Oplog: ${db._oplog.length})`)
metrics.queriesPerSecond = 0
metrics.seconds ++
console.log(`[${name}] ${metrics.queriesPerSecond} queries per second, ${metrics.totalQueries} queries in ${metrics.seconds} seconds (Oplog: ${db._oplog.length})`)
metrics.queriesPerSecond = 0

if (metrics.seconds % 10 === 0) {
console.log(`[${name}] --> Average of ${metrics.lastTenSeconds / 10} q/s in the last 10 seconds`)
metrics.lastTenSeconds = 0
}
if(metrics.seconds % 10 === 0) {
console.log(`[${name}] --> Average of ${metrics.lastTenSeconds/10} q/s in the last 10 seconds`)
metrics.lastTenSeconds = 0
}
}

const database = 'benchmark-replication'
const updateCount = 20000

// Start
console.log('Starting IPFS daemons...')
console.log("Starting IPFS daemons...")

pMapSeries([conf1], d => startIpfs('js-ipfs', d))
pMapSeries([conf1,], d => startIpfs('js-ipfs', d))
.then(async ([ipfs1]) => {
try {
// Create the databases
Expand All @@ -108,7 +108,7 @@ pMapSeries([conf1], d => startIpfs('js-ipfs', d))

// Metrics output for the writer, once/sec
const writeInterval = setInterval(() => {
outputMetrics('WRITE', db1, metrics1)
outputMetrics("WRITE", db1, metrics1)
if (metrics1.totalQueries === updateCount) {
clearInterval(writeInterval)
}
Expand Down
34 changes: 17 additions & 17 deletions benchmarks/benchmark-replication.js
Expand Up @@ -12,7 +12,7 @@ let metrics2 = {
totalQueries: 0,
seconds: 0,
queriesPerSecond: 0,
lastTenSeconds: 0
lastTenSeconds: 0,
}

const ipfsConf = {
Expand All @@ -26,22 +26,22 @@ const ipfsConf = {
MDNS: {
Enabled: true,
Interval: 0
}
}
},
},
}

const repoConf = {
storageBackends: {
blocks: DatastoreLevel
}
blocks: DatastoreLevel,
},
}

const defaultConfig = Object.assign({}, {
start: true,
EXPERIMENTAL: {
pubsub: true,
sharding: false,
dht: false
dht: false,
},
config: ipfsConf
})
Expand All @@ -52,21 +52,21 @@ const conf2 = Object.assign({}, defaultConfig, {

// Metrics output function
const outputMetrics = (name, db, metrics) => {
metrics.seconds++
console.log(`[${name}] ${metrics.queriesPerSecond} queries per second, ${metrics.totalQueries} queries in ${metrics.seconds} seconds (Oplog: ${db._oplog.length})`)
metrics.queriesPerSecond = 0

if (metrics.seconds % 10 === 0) {
console.log(`[${name}] --> Average of ${metrics.lastTenSeconds / 10} q/s in the last 10 seconds`)
metrics.lastTenSeconds = 0
}
metrics.seconds ++
console.log(`[${name}] ${metrics.queriesPerSecond} queries per second, ${metrics.totalQueries} queries in ${metrics.seconds} seconds (Oplog: ${db._oplog.length})`)
metrics.queriesPerSecond = 0

if(metrics.seconds % 10 === 0) {
console.log(`[${name}] --> Average of ${metrics.lastTenSeconds/10} q/s in the last 10 seconds`)
metrics.lastTenSeconds = 0
}
}

const database = 'benchmark-replication'
const updateCount = 20000

// Start
console.log('Starting IPFS daemons...')
console.log("Starting IPFS daemons...")

pMapSeries([conf2], d => startIpfs('js-ipfs', d))
.then(async ([ipfs2]) => {
Expand Down Expand Up @@ -97,10 +97,10 @@ pMapSeries([conf2], d => startIpfs('js-ipfs', d))
metrics2.lastTenSeconds += metrics2.queriesPerSecond
prevCount = metrics2.totalQueries

outputMetrics('READ', db2, metrics2)
outputMetrics("READ", db2, metrics2)

if (db2._oplog.length === updateCount) {
console.log('Finished')
console.log("Finished")
process.exit(0)
}
} catch (e) {
Expand Down
10 changes: 5 additions & 5 deletions conf/webpack.config.js
Expand Up @@ -14,12 +14,12 @@ module.exports = {
devtool: 'none',
externals: {
fs: '{}',
mkdirp: '{}'
mkdirp: '{}',
},
node: {
console: false,
Buffer: true,
mkdirp: 'empty'
mkdirp: "empty"
},
plugins: [
new webpack.DefinePlugin({
Expand All @@ -34,14 +34,14 @@ module.exports = {
path.resolve(__dirname, '../node_modules')
],
alias: {
leveldown: 'level-js'
}
leveldown: 'level-js',
},
},
resolveLoader: {
modules: [
'node_modules',
path.resolve(__dirname, '../node_modules')
],
moduleExtensions: ['-loader']
}
},
}
12 changes: 6 additions & 6 deletions conf/webpack.debug.config.js
Expand Up @@ -13,13 +13,13 @@ module.exports = {
devtool: 'source-map',
externals: {
fs: '{}',
mkdirp: '{}'
mkdirp: '{}',
},
node: {
console: false,
Buffer: true,
mkdirp: 'empty',
fs: 'empty'
mkdirp: "empty",
fs: "empty"
},
plugins: [
],
Expand All @@ -29,14 +29,14 @@ module.exports = {
path.resolve(__dirname, '../node_modules')
],
alias: {
leveldown: 'level-js'
}
leveldown: 'level-js',
},
},
resolveLoader: {
modules: [
'node_modules',
path.resolve(__dirname, '../node_modules')
],
moduleExtensions: ['-loader']
}
},
}
9 changes: 7 additions & 2 deletions conf/webpack.example.config.js
Expand Up @@ -10,6 +10,11 @@ module.exports = {
},
target: 'web',
devtool: 'none',
node: {
Buffer: true,
mkdirp: "empty",
fs: "empty"
},
plugins: [
new webpack.DefinePlugin({
'process.env': {
Expand All @@ -21,13 +26,13 @@ module.exports = {
modules: [
'node_modules',
path.resolve(__dirname, '../node_modules')
]
],
},
resolveLoader: {
modules: [
'node_modules',
path.resolve(__dirname, '../node_modules')
],
moduleExtensions: ['-loader']
}
},
}
6 changes: 3 additions & 3 deletions examples/browser/browser-webpack-example/index.js
Expand Up @@ -4,7 +4,7 @@
This is the entry point for Webpack to build the bundle from.
We use the same example code as the html browser example,
but we inject the Node.js modules of OrbitDB and IPFS into
the example.
the example.
In the html example, IPFS and OrbitDB are loaded from the
minified distribution builds (in '../lib')
Expand All @@ -17,11 +17,11 @@ import IPFS from 'ipfs'
import OrbitDB from '../../..'

// When 'orbit-db' was installed from npm, use with:
// import OrbitDB from 'orbit-db'
// import OrbitDB from 'orbit-db'

// Example main code
const example = require('../example')

// Call the start function and pass in the
// Call the start function and pass in the
// IPFS and OrbitDB modules
example(IPFS, OrbitDB)

0 comments on commit 4226921

Please sign in to comment.