Skip to content

Commit

Permalink
Merge pull request #2275 from LiskHQ/2254_duplicated-signatures
Browse files Browse the repository at this point in the history
Duplicated signatures in transactions - Closes #2254
  • Loading branch information
MaciejBaj committed Aug 13, 2018
2 parents 92c2c0e + 76611ea commit 85b9a37
Show file tree
Hide file tree
Showing 8 changed files with 2,009 additions and 449 deletions.
363 changes: 224 additions & 139 deletions modules/multisignatures.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/transport.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ __private.receiveSignature = function(query, cb) {

modules.multisignatures.processSignature(query, err => {
if (err) {
return setImmediate(cb, `Error processing signature: ${err}`);
return setImmediate(cb, `Error processing signature: ${err.message}`);
}
return setImmediate(cb);
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"node-mocks-http": "^1.6.6",
"pm2": "=2.4.6",
"prettier": "=1.10.2",
"rewire": "=2.5.2",
"rewire": "=4.0.1",
"rx": "=4.1.0",
"sinon": "=3.2.1",
"sinon-chai": "=2.14.0",
Expand Down
4 changes: 2 additions & 2 deletions test/functional/http/post/4.multisignature.js
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ describe('POST /api/transactions (type 4) register multisignature', () => {
expect(res)
.to.have.nested.property('body.message')
.to.equal(
'Error processing signature: Permission to sign transaction denied'
'Error processing signature: Unable to process signature, signature already exists'
);
});
});
Expand All @@ -714,7 +714,7 @@ describe('POST /api/transactions (type 4) register multisignature', () => {
expect(res)
.to.have.nested.property('body.message')
.to.equal(
'Error processing signature: Failed to verify signature'
'Error processing signature: Unable to process signature, verification failed'
);
});
});
Expand Down

0 comments on commit 85b9a37

Please sign in to comment.