refactor

Author: daviddias

README.md

@@ -63,24 +63,21 @@ See https://ipfs.github.io/js-ipfs-bitswap
 ```sh
 » tree src
 src
-├── components
-│   ├── decision
-│   │   ├── engine.js
-│   │   ├── index.js
-│   │   └── ledger.js
-│   ├── network             # Handles peerSet and open new conns
-│   │   └── index.js
-│   └── want-manager        # Keeps track of all blocks the peer wants (not the others which it is connected)
-│       ├── index.js
-│       └── msg-queue.js    # Messages to send queue, one per peer
 ├── constants.js
+├── decision-engine
+│   ├── index.js
+│   └── ledger.js
 ├── index.js
-└── types
-    ├── message             # (Type) message that is put in the wire
+├── network.js             # Handles peerSet and open new conns
+├─── want-manager          # Keeps track of all blocks the peer (self) wants
+│   ├── index.js
+│   └── msg-queue.js       # Messages to send queue, one per peer
+└─── types
+    ├── message            # (Type) message that is put in the wire
     │   ├── entry.js
     │   ├── index.js
     │   └── message.proto.js
-    └── wantlist            # (Type) track wanted blocks
+    └── wantlist           # (Type) track wanted blocks
         ├── entry.js
         └── index.js
 ```

package.json

@@ -75,6 +75,7 @@
     "pull-length-prefixed": "^1.3.0",
     "pull-pushable": "^2.1.1",
     "pull-stream": "^3.6.0",
+    "safe-buffer": "^5.1.1",
     "varint-decoder": "^0.1.1"
   },
   "contributors": [

src/components/decision-engine/index.js renamed to src/decision-engine/index.js

@@ -15,8 +15,8 @@ const pullAllWith = require('lodash.pullallwith')
 const log = debug('bitswap:engine')
 log.error = debug('bitswap:engine:error')
 
-const Message = require('../../types/message')
-const Wantlist = require('../../types/wantlist')
+const Message = require('../types/message')
+const Wantlist = require('../types/wantlist')
 const Ledger = require('./ledger')
 
 const MAX_MESSAGE_SIZE = 512 * 1024

src/components/decision-engine/ledger.js renamed to src/decision-engine/ledger.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Wantlist = require('../../types/wantlist')
+const Wantlist = require('../types/wantlist')
 
 class Ledger {
   constructor (peerId) {

src/index.js

@@ -10,9 +10,9 @@ const map = require('async/map')
 const once = require('once')
 
 const CONSTANTS = require('./constants')
-const WantManager = require('./components/want-manager')
-const Network = require('./components/network')
-const DecisionEngine = require('./components/decision-engine')
+const WantManager = require('./want-manager')
+const Network = require('./network')
+const DecisionEngine = require('./decision-engine')
 
 const log = debug('bitswap')
 log.error = debug('bitswap:error')

src/components/network.js renamed to src/network.js

@@ -5,8 +5,8 @@ const pull = require('pull-stream')
 const waterfall = require('async/waterfall')
 const each = require('async/each')
 
-const Message = require('../types/message')
-const CONSTANTS = require('../constants')
+const Message = require('./types/message')
+const CONSTANTS = require('./constants')
 const debug = require('debug')
 const log = debug('bitswap:network')
 log.error = debug('bitswap:network:error')

src/components/want-manager/index.js renamed to src/want-manager/index.js

@@ -2,9 +2,9 @@
 
 const debug = require('debug')
 
-const Message = require('../../types/message')
-const Wantlist = require('../../types/wantlist')
-const CONSTANTS = require('../../constants')
+const Message = require('../types/message')
+const Wantlist = require('../types/wantlist')
+const CONSTANTS = require('../constants')
 const MsgQueue = require('./msg-queue')
 
 const log = debug('bitswap:wantmanager')

src/components/want-manager/msg-queue.js renamed to src/want-manager/msg-queue.js

@@ -2,7 +2,7 @@
 
 const debug = require('debug')
 const debounce = require('lodash.debounce')
-const Message = require('../../types/message')
+const Message = require('../types/message')
 
 const log = debug('bitswap:wantmanager:queue')
 log.error = debug('bitswap:wantmanager:queue:error')

test/index-test.js renamed to test/bitswap.js

@@ -18,8 +18,10 @@ const PeerBook = require('peer-book')
 const Message = require('../src/types/message')
 const Bitswap = require('../src')
 
-const utils = require('./utils')
-const makeBlock = utils.makeBlock
+const mockNetwork = require('./utils/mock-network').mockNetwork
+const applyNetwork = require('./utils/mock-network').applyNetwork
+
+const makeBlock = require('./utils/make-block')
 
 function hasBlocks (msg, store, cb) {
   each(msg.blocks.values(), (b, cb) => {
@@ -256,7 +258,7 @@ module.exports = (repo) => {
       it('block is added locally afterwards', (done) => {
         const block = blocks[9]
         const bs = new Bitswap(createLibp2pMock(), store)
-        const net = utils.mockNetwork()
+        const net = mockNetwork()
 
         bs.network = net
         bs.wm.network = net
@@ -328,7 +330,7 @@ module.exports = (repo) => {
           }
         }
         bs1 = new Bitswap(libp2pMock, store)
-        utils.applyNetwork(bs1, n1)
+        applyNetwork(bs1, n1)
         bs1.start()
 
         let store2
@@ -338,7 +340,7 @@ module.exports = (repo) => {
           (repo, cb) => {
             store2 = repo.blocks
             bs2 = new Bitswap(createLibp2pMock(), store2)
-            utils.applyNetwork(bs2, n2)
+            applyNetwork(bs2, n2)
             bs2.start()
             bs1._onPeerConnected(other)
             bs2._onPeerConnected(me)

test/browser.js

@@ -41,5 +41,5 @@ const repo = {
   remove: removeRepos
 }
 
-require('./index-test')(repo)
-require('./components/decision-engine/index-test')(repo)
+require('./bitswap.js')(repo)
+require('./decision-engine/decision-engine')(repo)