Merge pull request bitpay#406 from isocolsky/ref/locked-err

Return typed error on lock timeout
micahriggan · Nov 20, 2015 · 06ec178 · 06ec178
2 parents 9b5b6db + 524ed77
commit 06ec178
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/errors/errordefinitions.js b/lib/errors/errordefinitions.js
@@ -29,6 +29,7 @@ var errors = {
   UPGRADE_NEEDED: 'Client app needs to be upgraded',
   WALLET_ALREADY_EXISTS: 'Wallet already exists',
   WALLET_FULL: 'Wallet full',
+  WALLET_LOCKED: 'Wallet is locked',
   WALLET_NOT_COMPLETE: 'Wallet is not complete',
   WALLET_NOT_FOUND: 'Wallet not found',
 };

diff --git a/lib/lock.js b/lib/lock.js
@@ -7,6 +7,8 @@ log.disableColor();
 var LocalLock = require('./locallock');
 var RemoteLock = require('locker');
 
+var Errors = require('./errors/errordefinitions');
+
 function Lock(opts) {
   opts = opts || {};
   if (opts.lockerServer) {
@@ -29,7 +31,7 @@ Lock.prototype.runLocked = function(token, cb, task) {
   $.shouldBeDefined(token);
 
   this.lock.locked(token, 5 * 1000, 24 * 60 * 60 * 1000, function(err, release) {
-    if (err) return cb(new Error('Wallet is locked'));
+    if (err) return cb(Errors.WALLET_LOCKED);
     var _cb = function() {
       cb.apply(null, arguments);
       release();