From 469d7dfebe3853902f0a742e3a3ad4e223c4230b Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Wed, 11 Feb 2015 11:27:52 -0300 Subject: [PATCH] remove redundant check --- cli.js | 3 +++ db/copay.db/000013.ldb | Bin 0 -> 1113 bytes db/copay.db/CURRENT | 1 + db/copay.db/LOCK | 0 db/copay.db/LOG | 3 +++ db/copay.db/LOG.old | 3 +++ db/copay.db/MANIFEST-000021 | Bin 0 -> 65536 bytes lib/server.js | 3 +-- 8 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 cli.js create mode 100644 db/copay.db/000013.ldb create mode 100644 db/copay.db/CURRENT create mode 100644 db/copay.db/LOCK create mode 100644 db/copay.db/LOG create mode 100644 db/copay.db/LOG.old create mode 100644 db/copay.db/MANIFEST-000021 diff --git a/cli.js b/cli.js new file mode 100644 index 0000000..d4f0dd4 --- /dev/null +++ b/cli.js @@ -0,0 +1,3 @@ +var _ = require('lodash'); +var request = require('request'); +var program = require('commander'); diff --git a/db/copay.db/000013.ldb b/db/copay.db/000013.ldb new file mode 100644 index 0000000000000000000000000000000000000000..877671a6e93cbfb7c82c4ddf9d12acf4ec88022c GIT binary patch literal 1113 zcmaJ=J8YX(6#oA_nnW#9h!mBfs>oFb20PsM!z?6C(ln_<^H7kRWVp}7s{PyXZzndv z5)&X0MM8+Vteucp7yzNFI~x*WsDzk0Ssl7m3S2i*M~?0t?)lF7?m6dvckssGNkTtQ zZKJ7szBLCi<`N=Q_(@5MAoB%<01=WXDWV5EuViVG8B8b=5R zXP9Ablu0$dhhMi@o#U$;5sPb0?5WMHS@M^ck&1} zedc265o~r$t!iTfTj}&pY44x_v~w+==eINGyPyOMp!je)=IotKef{83ItB{g{F7Xv zOcrK;n)Z>Q%N`CI-N?f^D)-8#3&&f=uH4zWe^mKsUHVPe=$&q?uI=V)H_MwFOO5jV zoSA#QdZ%oAONW(^?QT|%@utd}*>2tKEVPd*w=CHpoo=1w%P!k#ZXYjNTB+3Z3|0xGG(I;(3TrP2Wll*LC<_Wo<2bQaI}WXf6btB}FbV~v zl~XuAu7*Mrse@z~rb~lG7C{&Ua*ld2jDg%?0=eYab0djh9udv4MJi66IKictk{TWi zivo)y$$_*^wc+nehx_;MXWvT3M$ntdZ%dbk-l@1RCwtQeFO#{^P_4CnYrf`Be9f8p z#ZEj|v&CAYQD1olJ)W2uCJm{QpZ`G5lc~{e`tOA$zf8QwethxX@}Cp$el>Y@==y*A N@Z~38-ss%=>px-PLJ9x? literal 0 HcmV?d00001 diff --git a/db/copay.db/CURRENT b/db/copay.db/CURRENT new file mode 100644 index 0000000..e60e154 --- /dev/null +++ b/db/copay.db/CURRENT @@ -0,0 +1 @@ +MANIFEST-000021 diff --git a/db/copay.db/LOCK b/db/copay.db/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/db/copay.db/LOG b/db/copay.db/LOG new file mode 100644 index 0000000..dc60017 --- /dev/null +++ b/db/copay.db/LOG @@ -0,0 +1,3 @@ +2015/02/09-15:18:43.041206 106a0a000 Recovering log #20 +2015/02/09-15:18:43.042521 106a0a000 Delete type=0 #20 +2015/02/09-15:18:43.042604 106a0a000 Delete type=3 #19 diff --git a/db/copay.db/LOG.old b/db/copay.db/LOG.old new file mode 100644 index 0000000..26e8958 --- /dev/null +++ b/db/copay.db/LOG.old @@ -0,0 +1,3 @@ +2015/02/09-15:18:03.323403 103704000 Recovering log #18 +2015/02/09-15:18:03.324683 103704000 Delete type=0 #18 +2015/02/09-15:18:03.324769 103704000 Delete type=3 #17 diff --git a/db/copay.db/MANIFEST-000021 b/db/copay.db/MANIFEST-000021 new file mode 100644 index 0000000000000000000000000000000000000000..c99d283ea7f922815452dcff5afa28bdbca2a23d GIT binary patch literal 65536 zcmeIuF-ikb6a~;3BNz)?1-mR@uWt6+ynB4kx2vahx9PU4%}H_gK2F1G-R<*c5@KxT zVLGjvHs&fVVq0~oX{&w~LaY~Q-uIy#6~9;Sy5%x&C)3d8hnV`R&eyR@DW<9)(!2^o zKTCNCDb!6_9y%YN-*@ApJUTxuMi<9_Lx-0nK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB=F2 G6Zipc$|-LE literal 0 HcmV?d00001 diff --git a/lib/server.js b/lib/server.js index 6ac2dd3..0b4ae74 100644 --- a/lib/server.js +++ b/lib/server.js @@ -548,7 +548,6 @@ CopayServer.prototype.signTx = function(opts, cb) { id: opts.txProposalId }, function(err, txp) { if (err) return cb(err); - if (!txp) return cb(new ClientError('Transaction proposal not found')); var action = _.find(txp.actions, { copayerId: self.copayerId @@ -602,7 +601,7 @@ CopayServer.prototype.rejectTx = function(opts, cb) { id: opts.txProposalId }, function(err, txp) { if (err) return cb(err); - if (!txp) return cb(new ClientError('Transaction proposal not found')); + var action = _.find(txp.actions, { copayerId: self.copayerId });