From 1432cc4f177acaaabc0232df34f744d4d1f256c1 Mon Sep 17 00:00:00 2001
From: haad <haad@headbanggames.com>
Date: Thu, 7 Jul 2016 16:27:53 +0200
Subject: [PATCH] Change .connect() to connect to a <host:port> instead of IPFS
 hash.

---
 README.md              | 12 ++++-----
 src/OrbitDB.js         | 56 +++---------------------------------------
 test/client.test.js    |  3 +--
 test/counterdb.test.js |  2 +-
 4 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index b131df2..3172b49 100644
--- a/README.md
+++ b/README.md
@@ -37,17 +37,17 @@ npm install
 
 Key-Value store [example](https://github.com/haadcode/orbit-db/blob/master/examples/keyvalue.js):
 ```
-node examples/keyvalue.js <host> <username> <channel> <key> <value>
+node examples/keyvalue.js <host:port> <username> <channel> <key> <value>
 ```
 
 Event log [example](https://github.com/haadcode/orbit-db/blob/master/examples/eventlog.js) (run several in separate shells):
 ```
-node examples/eventlog.js <host> <username> <channel> <data> <interval in ms>
+node examples/eventlog.js <host:port> <username> <channel> <data> <interval in ms>
 ```
 
 Benchmark writes:
 ```
-node examples/benchmark.js <host> <username> <channel>;
+node examples/benchmark.js <host:port> <username> <channel>;
 ```
 
 
@@ -69,7 +69,7 @@ Then open `examples/browser.html`. See the full example [here](https://github.co
     <script type="text/javascript" src="ipfsapi.min.js" charset="utf-8"></script>
     <script type="text/javascript">
       const ipfs = IpfsApi();
-      OrbitDB.connect('QmRB8x6aErtKTFHDNRiViixSKYwW1DbfcvJHaZy1hnRzLM', 'user1', '', ipfs).then((orbit) => {
+      OrbitDB.connect('localhost:3333', 'user1', '', ipfs).then((orbit) => {
         orbit.kvstore('test').then((db) => {
           db.put('hello', 'world').then((res) => {
             const result = db.get(key);
@@ -89,7 +89,7 @@ _See usage example below_
 
 _OrbitDB calls its namespaces channels. A channel is similar to "table", "keyspace", "topic", "feed" or "collection" in other db systems._
 
-    connect(host, port, username, password)
+    connect(<host:port>, username, password)
 
     channel(name, password)
 
@@ -125,7 +125,7 @@ const ipfs = ipfsAPI();
 
 async(() => {
     // Connect
-    const orbit = await(OrbitClient.connect('QmRB8x6aErtKTFHDNRiViixSKYwW1DbfcvJHaZy1hnRzLM', 'usernamne', '', ipfs));
+    const orbit = await(OrbitClient.connect('localhost:3333', 'usernamne', '', ipfs));
 
     /* Event Log */
     const eventlog = orbit.eventlog('eventlog test');
diff --git a/src/OrbitDB.js b/src/OrbitDB.js
index 43dc3f0..b0dfd21 100644
--- a/src/OrbitDB.js
+++ b/src/OrbitDB.js
@@ -125,60 +125,12 @@ class OrbitDB {
   _connect(hash, username, password, allowOffline) {
     if(allowOffline === undefined) allowOffline = false;
 
-    const catFromJsIpfsApi = (hash) => {
-      return new Promise((resolve, reject) => {
-        if(this._ipfs.cat) {
-          logger.debug(".cat with js-ipfs-api");
-          this._ipfs.cat(hash, (err, res) => {
-            if(err) return reject(err)
-            let buf = '';
-            res
-              .on('error', (err) => reject(err))
-              .on('data', (data) => buf += data)
-              .on('end', () => resolve(buf.toString()))
-          });
-        } else {
-          reject("not using js-ipfs-api");
-        }
-      });
-    };
-
-    const catFromJsIpfs = (hash) => {
-      return new Promise((resolve, reject) => {
-        if(this._ipfs.files.cat) {
-          logger.debug(".cat with js-ipfs");
-          setTimeout(reject, 5000);
-          this._ipfs.files.cat(hash, (err, res) => {
-            if(err) return reject(err);
-            let buf = '';
-            res.on('data', (res) => {
-              res.stream
-                .on('error', (err) => reject(err))
-                .on('data', (data) => buf += data)
-                .on('end', () => resolve(buf.toString()))
-              })
-          });
-        } else {
-          reject("not using js-ipfs");
-        }
-      });
-    };
-
     const readNetworkInfo = (hash) => {
       return new Promise((resolve, reject) => {
-        catFromJsIpfsApi(hash).then(resolve)
-          .catch((e) => {
-            catFromJsIpfs(hash).then(resolve)
-              .catch((e) => {
-                logger.warn(".cat - no api or content found, using mock")
-                resolve(JSON.stringify({
-                  // name: 'localhost dev network',
-                  name: 'Orbit DEV Network',
-                  // publishers: ['localhost:3333']
-                  publishers: ['178.62.241.75:3333']
-                }));
-              });
-          });
+        resolve(JSON.stringify({
+          name: 'Orbit DEV Network',
+          publishers: [hash]
+        }));
       });
     };
 
diff --git a/test/client.test.js b/test/client.test.js
index 25f8989..207a4f5 100644
--- a/test/client.test.js
+++ b/test/client.test.js
@@ -15,8 +15,7 @@ const OrbitServer = require('orbit-server/src/server');
 require('logplease').setLogLevel('ERROR');
 
 // Orbit
-// const network = 'QmRB8x6aErtKTFHDNRiViixSKYwW1DbfcvJHaZy1hnRzLM';
-const network = 'Qmeh6ktQ1YFKksugJb59vBxG51xXoEvjBZXRK3DdrF3mNj';
+const network = 'localhost:3333';
 const username = 'testrunner';
 const password = '';
 
diff --git a/test/counterdb.test.js b/test/counterdb.test.js
index 65cfd23..2ae7da6 100644
--- a/test/counterdb.test.js
+++ b/test/counterdb.test.js
@@ -13,7 +13,7 @@ const IPFS        = require('ipfs')
 // Mute logging
 require('logplease').setLogLevel('ERROR');
 
-const network   = 'Qmeh6ktQ1YFKksugJb59vBxG51xXoEvjBZXRK3DdrF3mNj';
+const network = 'localhost:3333';
 const username  = 'testrunner';
 const username2 = 'rennurtset';
 const ipfsPath  = '/tmp/orbittests';