From 471b189cbbeaad16f6d6ee6b74a18f3902a6a86e Mon Sep 17 00:00:00 2001 From: haad Date: Fri, 26 Feb 2016 14:06:47 +0100 Subject: [PATCH] Cleanup --- examples/benchmark.js | 7 +++---- examples/keyvalue.js | 6 +++--- examples/keyvalueReader.js | 4 ++-- src/OrbitClient.js | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/benchmark.js b/examples/benchmark.js index c504728..b27410f 100644 --- a/examples/benchmark.js +++ b/examples/benchmark.js @@ -5,8 +5,7 @@ var OrbitClient = require('../src/OrbitClient'); var Timer = require('./Timer'); // orbit-server -// const host = 'localhost'; -const host = '178.62.241.75'; +const host = 'localhost'; const port = 3333; var username = 'testrunner'; @@ -17,8 +16,8 @@ let run = (async(() => { // Connect var orbit = OrbitClient.connect(host, port, username, password); - const id = process.argv[2] ? process.argv[2] : 'a'; - const channelName = 'c1'; + const id = process.argv[3] ? process.argv[3] : 'a'; + const channelName = process.argv[2] ? process.argv[2] : 'c1'; const db = orbit.channel(channelName); // Metrics diff --git a/examples/keyvalue.js b/examples/keyvalue.js index 906b941..5e821dc 100644 --- a/examples/keyvalue.js +++ b/examples/keyvalue.js @@ -23,14 +23,14 @@ let run = (async(() => { while(true) { const key = process.argv[4] ? process.argv[4] : 'greeting'; const value = process.argv[5] ? process.argv[5] : 'Hello world'; - let timer = new Timer(true); + const timer = new Timer(true); db.put(key, value + " " + count); - let v = db.get(key); + const result = db.get(key); console.log("---------------------------------------------------") console.log("Key | Value") console.log("---------------------------------------------------") - console.log(`${key} | ${v}`); + console.log(`${key} | ${result}`); console.log("---------------------------------------------------") console.log(`Query #${count} took ${timer.stop(true)} ms\n`); diff --git a/examples/keyvalueReader.js b/examples/keyvalueReader.js index 8aa724f..5b3d188 100644 --- a/examples/keyvalueReader.js +++ b/examples/keyvalueReader.js @@ -23,12 +23,12 @@ let run = (async(() => { setInterval(async(() => { const key = process.argv[4] ? process.argv[4] : 'greeting'; let timer = new Timer(true); - let v = db.get(key); + const result = db.get(key); console.log("---------------------------------------------------") console.log("Key | Value") console.log("---------------------------------------------------") - console.log(`${key} | ${v}`); + console.log(`${key} | ${result}`); console.log("---------------------------------------------------") console.log(`Query #${count} took ${timer.stop(true)} ms\n`); diff --git a/src/OrbitClient.js b/src/OrbitClient.js index d715822..158812b 100644 --- a/src/OrbitClient.js +++ b/src/OrbitClient.js @@ -27,7 +27,7 @@ class OrbitClient { channel(hash, password) { if(password === undefined) password = ''; - const processMsg = async((hash, message) => { + const onMessage = async((hash, message) => { const other = await(List.fromIpfsHash(this._ipfs, message)); if(other.id !== this.user.username) { this._store.join(other); @@ -42,7 +42,7 @@ class OrbitClient { } }); - this._pubsub.subscribe(hash, password, processMsg, onLatest); + this._pubsub.subscribe(hash, password, onMessage, onLatest); return { iterator: (options) => this._iterator(hash, password, options),