Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
Merge pull request #105 from cmgustavo/release/v0.1.1
Browse files Browse the repository at this point in the history
New release v0.1.1
  • Loading branch information
cmgustavo committed Aug 5, 2015
2 parents 217bc22 + 3b52728 commit 5cc2b69
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
16 changes: 8 additions & 8 deletions bitcore-wallet-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,19 +355,19 @@ API.prototype._doRequest = function(method, url, args, cb) {
}));
if (!res) {
return cb({
code: 'CONNERROR',
code: 'CONNECTION_ERROR',
});
}

if (res.statusCode != 200) {
if (res.statusCode == 404)
return cb({
code: 'NOTFOUND'
code: 'NOT_FOUND'
});

if (!res.statusCode)
return cb({
code: 'CONNERROR',
code: 'CONNECTION_ERROR',
});

return cb(API._parseError(body));
Expand Down Expand Up @@ -758,7 +758,7 @@ API.prototype.recreateWallet = function(cb) {
};
self._doPostRequest('/v1/wallets/', args, function(err, body) {
// Ignore error is wallet already exist
if (err && err.code != 'WEXISTS') return cb(err);
if (err && err.code != 'WALLET_ALREADY_EXISTS') return cb(err);


var i = 1;
Expand All @@ -768,7 +768,7 @@ API.prototype.recreateWallet = function(cb) {
isTemporaryRequestKey: item.isTemporaryRequestKey,
}, function(err) {
//Ignore error is copayer already in wallet
if (err && err.code == 'CINWALLET') return next();
if (err && err.code == 'COPAYER_IN_WALLET') return next();
return next(err);
});
}, cb);
Expand Down Expand Up @@ -1397,7 +1397,7 @@ API.prototype.createWalletFromOldCopay = function(username, password, blob, cb)
id: walletId,
walletPrivKey: walletPrivKey,
}, function(err, secret) {
if (err && err.code == 'WEXISTS') {
if (err && err.code == 'WALLET_ALREADY_EXISTS') {

self.credentials.addWalletInfo(walletId, walletName, m, n,
walletPrivKey, copayerName);
Expand Down Expand Up @@ -106004,7 +106004,7 @@ module.exports={
"name": "bitcore-wallet-client",
"description": "Client for bitcore-wallet-service",
"author": "BitPay Inc",
"version": "0.1.0",
"version": "0.1.1",
"keywords": [
"bitcoin",
"copay",
Expand Down Expand Up @@ -106036,7 +106036,7 @@ module.exports={
"uglify": "^0.1.1"
},
"devDependencies": {
"bitcore-wallet-service": "0.1.0",
"bitcore-wallet-service": "0.1.1",
"chai": "^1.9.1",
"coveralls": "^2.11.2",
"grunt-jsdoc": "^0.5.8",
Expand Down
7 changes: 4 additions & 3 deletions bitcore-wallet-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bitcore-wallet-client",
"main": "index.js",
"version": "0.1.0",
"version": "0.1.1",
"homepage": "https://github.com/bitpay/bitcore-wallet-client",
"authors": ["BitPay Inc"],
"description": "Client for bitcore-wallet-service",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bitcore-wallet-client",
"description": "Client for bitcore-wallet-service",
"author": "BitPay Inc",
"version": "0.1.0",
"version": "0.1.1",
"keywords": [
"bitcoin",
"copay",
Expand Down

0 comments on commit 5cc2b69

Please sign in to comment.