From 8f57e2de19f3797abf7c61f1d836195b4eb21c2e Mon Sep 17 00:00:00 2001 From: Stephen Whitmore Date: Wed, 16 Mar 2016 13:21:59 -0700 Subject: [PATCH 1/2] renames ipfs-core to just core --- src/cli/utils.js | 2 +- src/{ipfs-core => core}/default-repo/browser.js | 0 src/{ipfs-core => core}/default-repo/index.js | 0 src/{ipfs-core => core}/default-repo/node.js | 0 src/{ipfs-core => core}/index.js | 0 src/http-api/index.js | 2 +- tests/test-core/test-block.js | 2 +- tests/test-core/test-bootstrap.js | 2 +- tests/test-core/test-config.js | 2 +- tests/test-core/test-id.js | 2 +- tests/test-core/test-object.js | 2 +- tests/test-core/test-version.js | 2 +- 12 files changed, 8 insertions(+), 8 deletions(-) rename src/{ipfs-core => core}/default-repo/browser.js (100%) rename src/{ipfs-core => core}/default-repo/index.js (100%) rename src/{ipfs-core => core}/default-repo/node.js (100%) rename src/{ipfs-core => core}/index.js (100%) diff --git a/src/cli/utils.js b/src/cli/utils.js index 94756d6221..c6e43daf4c 100644 --- a/src/cli/utils.js +++ b/src/cli/utils.js @@ -2,7 +2,7 @@ const fs = require('fs') const os = require('os') const APIctl = require('ipfs-api') const multiaddr = require('multiaddr') -const IPFS = require('../ipfs-core') +const IPFS = require('../core') const debug = require('debug') const log = debug('cli') log.error = debug('cli:error') diff --git a/src/ipfs-core/default-repo/browser.js b/src/core/default-repo/browser.js similarity index 100% rename from src/ipfs-core/default-repo/browser.js rename to src/core/default-repo/browser.js diff --git a/src/ipfs-core/default-repo/index.js b/src/core/default-repo/index.js similarity index 100% rename from src/ipfs-core/default-repo/index.js rename to src/core/default-repo/index.js diff --git a/src/ipfs-core/default-repo/node.js b/src/core/default-repo/node.js similarity index 100% rename from src/ipfs-core/default-repo/node.js rename to src/core/default-repo/node.js diff --git a/src/ipfs-core/index.js b/src/core/index.js similarity index 100% rename from src/ipfs-core/index.js rename to src/core/index.js diff --git a/src/http-api/index.js b/src/http-api/index.js index fec9c540d0..e0cf86d95e 100644 --- a/src/http-api/index.js +++ b/src/http-api/index.js @@ -1,7 +1,7 @@ 'use strict' const Hapi = require('hapi') -const IPFS = require('../ipfs-core') +const IPFS = require('../core') const debug = require('debug') const fs = require('fs') const os = require('os') diff --git a/tests/test-core/test-block.js b/tests/test-core/test-block.js index e7ae341ff1..025ef99a81 100644 --- a/tests/test-core/test-block.js +++ b/tests/test-core/test-block.js @@ -3,7 +3,7 @@ const expect = require('chai').expect const base58 = require('bs58') const fs = require('fs') -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') const Block = require('ipfs-blocks').Block const isNode = !global.window diff --git a/tests/test-core/test-bootstrap.js b/tests/test-core/test-bootstrap.js index ad777ac6e0..c7cc803d03 100644 --- a/tests/test-core/test-bootstrap.js +++ b/tests/test-core/test-bootstrap.js @@ -3,7 +3,7 @@ const expect = require('chai').expect process.env.IPFS_PATH = process.cwd() + '/tests/repo-example' -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') describe('bootstrap', () => { var ipfs diff --git a/tests/test-core/test-config.js b/tests/test-core/test-config.js index cbbd86a24f..4c57de18e6 100644 --- a/tests/test-core/test-config.js +++ b/tests/test-core/test-config.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ const expect = require('chai').expect -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') describe('config', () => { var defaultConfig = { diff --git a/tests/test-core/test-id.js b/tests/test-core/test-id.js index 1520af1839..6486a76afa 100644 --- a/tests/test-core/test-id.js +++ b/tests/test-core/test-id.js @@ -3,7 +3,7 @@ const expect = require('chai').expect process.env.IPFS_PATH = process.cwd() + '/tests/repo-example' -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') describe('id', () => { var ipfs diff --git a/tests/test-core/test-object.js b/tests/test-core/test-object.js index 6e07a75197..c66c1a5e37 100644 --- a/tests/test-core/test-object.js +++ b/tests/test-core/test-object.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ const expect = require('chai').expect -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') const bs58 = require('bs58') const mDAG = require('ipfs-merkle-dag') const DAGNode = mDAG.DAGNode diff --git a/tests/test-core/test-version.js b/tests/test-core/test-version.js index 43bdf6d724..da96ee4190 100644 --- a/tests/test-core/test-version.js +++ b/tests/test-core/test-version.js @@ -3,7 +3,7 @@ const expect = require('chai').expect process.env.IPFS_PATH = process.cwd() + '/tests/repo-example' -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') describe('version', () => { var ipfs From 2c4ac6e300274852b05a3ce31a357cdedf9a9c43 Mon Sep 17 00:00:00 2001 From: Stephen Whitmore Date: Mon, 21 Mar 2016 15:03:03 -0700 Subject: [PATCH 2/2] fixes paths --- src/cli/commands/files/add.js | 2 +- tests/test-core/test-swarm-node.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/commands/files/add.js b/src/cli/commands/files/add.js index 35ca7b4a0e..5a0fd79138 100644 --- a/src/cli/commands/files/add.js +++ b/src/cli/commands/files/add.js @@ -1,7 +1,7 @@ 'use strict' const Command = require('ronin').Command -const IPFS = require('../../../ipfs-core') +const IPFS = require('../../../core') const debug = require('debug') const log = debug('cli:version') log.error = debug('cli:version:error') diff --git a/tests/test-core/test-swarm-node.js b/tests/test-core/test-swarm-node.js index 7843cbd866..aaf073f6d0 100644 --- a/tests/test-core/test-swarm-node.js +++ b/tests/test-core/test-swarm-node.js @@ -3,7 +3,7 @@ const expect = require('chai').expect process.env.IPFS_PATH = process.cwd() + '/tests/repo-example' -const IPFS = require('../../src/ipfs-core') +const IPFS = require('../../src/core') describe('swarm', () => { var ipfs