Merge 2718d86 into 8ece060

mediachain · Jan 23, 2017 · 3c333e0 · 3c333e0
2 parents 8ece060 + 2718d86
commit 3c333e0
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 110 deletions.
diff --git a/integration-test/merge_test.js b/integration-test/merge_test.js
@@ -3,7 +3,7 @@
 
 const assert = require('assert')
 const { describe, it, before, after } = require('mocha')
-const uuid = require('node-uuid')
+const uuid = require('uuid')
 
 const { getTestNodeId } = require('../test/util')
 const { MediachainNode: AlephNode } = require('../src/peer/node')

diff --git a/integration-test/push_test.js b/integration-test/push_test.js
@@ -3,7 +3,7 @@
 
 const assert = require('assert')
 const { describe, it, before, after } = require('mocha')
-const uuid = require('node-uuid')
+const uuid = require('uuid')
 const { promiseHash } = require('../src/common/util')
 
 const { getTestNodeId } = require('../test/util')

diff --git a/integration-test/remote_data_test.js b/integration-test/remote_data_test.js
@@ -3,7 +3,7 @@
 
 const assert = require('assert')
 const { describe, it, before } = require('mocha')
-const uuid = require('node-uuid')
+const uuid = require('uuid')
 
 const { getTestNodeId } = require('../test/util')
 const { MediachainNode: AlephNode } = require('../src/peer/node')

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json