Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Fix transactionInPool bug - Closes #707 #821

Merged
merged 8 commits into from
Oct 6, 2017
Merged

Conversation

diego-G
Copy link

@diego-G diego-G commented Oct 4, 2017

Due to the refactor on #561 is taking too long, we include small temporal fix with some tests. Hence it won't bother another builds anymore.

Closes #707

@Isabello
Copy link
Contributor

Isabello commented Oct 4, 2017

Is this done and ready to be reviewed? If not can you close and open when it is ready for review?

Copy link
Contributor

@MaciejBaj MaciejBaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please solve the comments left. Also please rename the test file pool.js to transactionPool.js as logic/pool.js file doesn't exist

// Init transaction logic
async.auto({
accountLogic: function (cb) {
modulesLoader.initLogicWithDb(AccountLogic, cb);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use initLogic instead of initLogicWithDb as database is not used in the test


describe('receiveTransactions', function () {

it('should do nothing for empty array', function (done) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returing {} is not doing nothing

@diego-G diego-G dismissed MaciejBaj’s stale review October 5, 2017 09:11

New commit addressing requested comments :)

@diego-G diego-G requested a review from MaciejBaj October 5, 2017 09:11
Copy link
Contributor

@MaciejBaj MaciejBaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing requested changes. One of them is still left - rename the test file pool.js to transactionPool.js

@diego-G diego-G dismissed MaciejBaj’s stale review October 5, 2017 10:37

We will unify that in the refactor.

Isabello
Isabello previously approved these changes Oct 5, 2017
MaciejBaj
MaciejBaj previously approved these changes Oct 5, 2017
@Isabello
Copy link
Contributor

Isabello commented Oct 5, 2017

@diego-G log an issue to track the unification.

@diego-G diego-G dismissed stale reviews from MaciejBaj and Isabello via 19e3634 October 5, 2017 13:39
Isabello
Isabello previously approved these changes Oct 5, 2017
@Isabello Isabello force-pushed the 707-fix_transactionInPool branch from 14ba571 to 463b72e Compare October 5, 2017 13:42
@diego-G diego-G force-pushed the 707-fix_transactionInPool branch from 6b0ea99 to ef17865 Compare October 5, 2017 14:07
@diego-G diego-G force-pushed the 707-fix_transactionInPool branch from ef17865 to 40c2dbf Compare October 5, 2017 14:16
@diego-G diego-G requested review from MaciejBaj and Isabello October 5, 2017 16:03
Isabello
Isabello previously approved these changes Oct 6, 2017
@@ -101,7 +101,9 @@ TransactionPool.prototype.transactionInPool = function (id) {
self.bundled.index[id],
self.queued.index[id],
self.multisignature.index[id]
].filter(Boolean).length > 0;
].filter(function (inList) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

karmacoma
karmacoma previously approved these changes Oct 6, 2017
4miners
4miners previously approved these changes Oct 6, 2017
@4miners 4miners dismissed stale reviews from karmacoma, Isabello, and themself via 9f1ac7f October 6, 2017 09:21
Copy link
Contributor

@Isabello Isabello left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving. @4miners and @karmacoma previously approved.

@Isabello Isabello merged commit 1290b7c into 1.0.0 Oct 6, 2017
@Isabello Isabello deleted the 707-fix_transactionInPool branch October 6, 2017 10:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants