From 97d4809f683cc311d353edded8208d4872a91c2e Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 12 Mar 2015 11:34:41 -0300 Subject: [PATCH] use Bitcore instance from BWU --- lib/model/address.js | 2 +- lib/model/copayer.js | 5 ++--- lib/model/txproposal.js | 2 +- lib/server.js | 4 ++-- package.json | 1 - test/integration/server.js | 2 +- test/models/txproposal.js | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/model/address.js b/lib/model/address.js index 8ef4db0..a5da342 100644 --- a/lib/model/address.js +++ b/lib/model/address.js @@ -1,6 +1,6 @@ 'use strict'; -var Bitcore = require('bitcore'); +var Bitcore = require('bitcore-wallet-utils').Bitcore; function Address() { this.version = '1.0.0'; diff --git a/lib/model/copayer.js b/lib/model/copayer.js index 1cfffd4..830a55f 100644 --- a/lib/model/copayer.js +++ b/lib/model/copayer.js @@ -4,12 +4,11 @@ var $ = require('preconditions').singleton(); var _ = require('lodash'); var util = require('util'); -var Bitcore = require('bitcore'); -var HDPublicKey = Bitcore.HDPublicKey; var Uuid = require('uuid'); var AddressManager = require('./addressmanager'); var WalletUtils = require('bitcore-wallet-utils'); - +var Bitcore = WalletUtils.Bitcore; +var HDPublicKey = Bitcore.HDPublicKey; function Copayer() { this.version = '1.0.0'; diff --git a/lib/model/txproposal.js b/lib/model/txproposal.js index ef77ec4..9f3bcc7 100644 --- a/lib/model/txproposal.js +++ b/lib/model/txproposal.js @@ -2,7 +2,7 @@ var _ = require('lodash'); var Uuid = require('uuid'); -var Bitcore = require('bitcore'); +var Bitcore = require('bitcore-wallet-utils').Bitcore; var Address = Bitcore.Address; var TxProposalAction = require('./txproposalaction'); diff --git a/lib/server.js b/lib/server.js index 4481849..1b4e707 100644 --- a/lib/server.js +++ b/lib/server.js @@ -8,7 +8,8 @@ var inherits = require('inherits'); var events = require('events'); var nodeutil = require('util'); -var Bitcore = require('bitcore'); +var WalletUtils = require('bitcore-wallet-utils'); +var Bitcore = WalletUtils.Bitcore; var PublicKey = Bitcore.PublicKey; var HDPublicKey = Bitcore.HDPublicKey; var Address = Bitcore.Address; @@ -17,7 +18,6 @@ var Explorers = require('bitcore-explorers'); var ClientError = require('./clienterror'); var Utils = require('./utils'); var Storage = require('./storage'); -var WalletUtils = require('bitcore-wallet-utils'); var Wallet = require('./model/wallet'); var Copayer = require('./model/copayer'); diff --git a/package.json b/package.json index a2c6aba..1ecbe19 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ }, "dependencies": { "async": "^0.9.0", - "bitcore": "^0.11.2", "bitcore-wallet-utils": "0.0.3", "bitcore-explorers": "^0.9.1", "body-parser": "^1.11.0", diff --git a/test/integration/server.js b/test/integration/server.js index 6b49596..dc2f016 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -11,10 +11,10 @@ var levelup = require('levelup'); var memdown = require('memdown'); var log = require('npmlog'); log.debug = log.verbose; -var Bitcore = require('bitcore'); var Utils = require('../../lib/utils'); var WalletUtils = require('bitcore-wallet-utils'); +var Bitcore = WalletUtils.Bitcore; var Storage = require('../../lib/storage'); var Wallet = require('../../lib/model/wallet'); diff --git a/test/models/txproposal.js b/test/models/txproposal.js index 119ab88..35b5ce8 100644 --- a/test/models/txproposal.js +++ b/test/models/txproposal.js @@ -5,7 +5,7 @@ var chai = require('chai'); var sinon = require('sinon'); var should = chai.should(); var TXP = require('../../lib/model/txproposal'); -var Bitcore = require('bitcore'); +var Bitcore = require('bitcore-wallet-utils').Bitcore; describe('TXProposal', function() {