Merge pull request bitpay#22 from matiu/feat/verificator2

Feat/verificator2
decred · Feb 17, 2015 · ab6ada0 · ab6ada0
2 parents a58a1a5 + fb88da6
commit ab6ada0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/bit-wallet/bit-join b/bit-wallet/bit-join
@@ -18,7 +18,7 @@ var secret = args[0];
 var copayerName = args[1] || process.env.USER;
 
 var client = utils.getClient(program);
-cli.joinWallet(secret, copayerName, function(err, xx) {
+client.joinWallet(secret, copayerName, function(err, xx) {
   utils.die(err);
   console.log(' * Wallet Joined.', xx || '');
 });
diff --git a/bit-wallet/bit-reject b/bit-wallet/bit-reject
diff --git a/bit-wallet/bit-rm b/bit-wallet/bit-rm
diff --git a/bit-wallet/bit-status b/bit-wallet/bit-status
@@ -17,7 +17,7 @@ client.getStatus(function(err, res) {
   utils.die(err);
 
   var x = res.wallet;
-  console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.isTestnet ? 'testnet' : 'livenet', x.m, x.n, x.status);
+  console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.network, x.m, x.n, x.status);
 
   var x = res.balance;
   console.log('* Balance %d (Locked: %d)', x.totalAmount, x.lockedAmount);