Merge branch 'master' of github.com:bitpay/bitcore into feature/bws-ts

Ray5254 · Mar 26, 2019 · 9ae2826 · 9ae2826
2 parents e5b2206 + 9151a24
commit 9ae2826
Show file tree

Hide file tree

Showing 34 changed files with 5,804 additions and 13,089 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,6 @@ COPY ./packages/bitcore-lib/package.json ./packages/bitcore-lib/package.json
 COPY ./packages/bitcore-lib-cash/package.json ./packages/bitcore-lib-cash/package.json
 COPY ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json
 COPY ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/package.json
-COPY ./packages/bitcore-payment-protocol/package.json ./packages/bitcore-payment-protocol/package.json
 COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json
 COPY ./packages/bitcore-client/package.json ./packages/bitcore-client/package.json
 COPY ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json

diff --git a/Dockerfile-test b/Dockerfile-test
@@ -15,7 +15,6 @@ COPY  ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/packa
 COPY  ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json
 COPY  ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json
 COPY  ./packages/bitcore-wallet-service/package.json ./packages/bitcore-wallet-service/package.json
-COPY  ./packages/bitcore-payment-protocol/package.json ./packages/bitcore-payment-protocol/package.json
 COPY  ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json
 COPY  ./packages/insight-previous/package.json ./packages/insight-previous/package.json
 COPY  ./packages/insight/package.json ./packages/insight/package.json

diff --git a/package.json b/package.json
@@ -31,8 +31,6 @@
     "ci:bitcore-p2p": "./ci.sh 'npm run test:bitcore-p2p'",
     "test:bitcore-p2p-cash": "cd ./packages/bitcore-p2p-cash && npm run test",
     "ci:bitcore-p2p-cash": "./ci.sh 'npm run test:bitcore-p2p-cash'",
-    "test:bitcore-payment-protocol": "cd ./packages/bitcore-payment-protocol && npm run test",
-    "ci:bitcore-payment-protocol": "./ci.sh 'npm run test:bitcore-payment-protocol'",
     "test:bitcore-mnemonic": "cd ./packages/bitcore-mnemonic && npm run test",
     "ci:bitcore-mnemonic": "./ci.sh 'npm run test:bitcore-mnemonic'",
     "test:insight-previous": "cd ./packages/insight-previous && npm run test",