refactor(pool): remove unnecessary check from validateTransactions() #2951
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We would call handler.throwIfCannotBeApplied(transaction, sender, databaseWalletManager); followed by handler.applyToSender(transaction, localWalletManager); but applyToSender() calls throwIfCannotBeApplied() internally, so we don't need to call it ourselves. Also, it was wrong to use the databaseWalletManager in that call because we are applying the transactions to localWalletManager, so the databaseWalletManager will be outdated (e.g. sender nonce and balance will be stale in databaseWalletManager). So, remove the unnecessary call to throwIfCannotBeApplied().
vasild
requested review from
air1one,
faustbrian,
kristjank and
spkjp
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #2951 +/- ##
=========================================
Coverage ? 29.1%
=========================================
Files ? 405
Lines ? 9825
Branches ? 464
=========================================
Hits ? 2860
Misses ? 6929
Partials ? 36
Continue to review full report at Codecov.
|
ghost
mentioned this pull request
throwIfCannotBeApplied() is not called directly anymore. It is only called from applyToSender(), but that method is mocked.
We don't call throwIfCannotBeApplied() before applyToSender() anymore, so the test becomes irrelevant - it fakes an exception from throwIfCannotBeApplied() and checks that applyToSender() is not called.
The test was trying to use transaction mockData.dummyLarge1 which has nonce=2, but without having prior transactions from that sender applied. So, use mockData.dummy10 which is from that sender and has nonce=1.
…move-throwIfCannotBeApplied * ArkEcosystem/core/develop: chore: drop node 11 support (#2965) test(e2e): No need to run as root the chmod command when modifying own's files (#2958) refactor(crypto): change maximum recipients of multipayment via milestone (#2961) ci: split functional job into 1 job per type (#2963) refactor(core-p2p): make peer reply errors less verbose (#2962) fix(core-state): index recipient wallets during bootstrap (#2947)
Codecov Report
@@ Coverage Diff @@
## develop #2951 +/- ##
==========================================
Coverage ? 29.11%
==========================================
Files ? 405
Lines ? 9826
Branches ? 465
==========================================
Hits ? 2861
Misses ? 6929
Partials ? 36
Continue to review full report at Codecov.
|
spkjp
approved these changes
Sep 24, 2019
ghost
deleted the
vasild
added a commit
that referenced
this pull request
Sep 27, 2019
…ts-nonce * ArkEcosystem/core/develop: refactor(core-transaction-pool): don't accept expired v1 transactions (#2948) fix(core-snapshots): remove bogus skipRoundRows (#2973) feat(core-api): endpoints for locks/businesses/bridgechains (#2940) fix(core-blockchain): round deletion during rollback (#2970) fix: range selection in pool's getTransactions() (#2952) feat: expose `isValidPeer` via ajv format rule (#2960) chore: remove trailing whitespace (#2971) fix(core-transactions): update wallet nonce when applying v1 transaction (#2959) fix(core-blockchain): do not reset `noBlockCounter` when `downloadBlocks` succeeds (#2968) refactor(pool): remove unnecessary check from validateTransactions() (#2951) ci: temporarily disable pull_request.synchronize event (#2966) refactor: strengthen a nonce check in performGenericWalletChecks() (#2949) ci: setup github action workflow for e2e tests (#2964) chore: drop node 11 support (#2965) test(e2e): No need to run as root the chmod command when modifying own's files (#2958) refactor(crypto): change maximum recipients of multipayment via milestone (#2961) ci: split functional job into 1 job per type (#2963) refactor(core-p2p): make peer reply errors less verbose (#2962) fix(core-state): index recipient wallets during bootstrap (#2947) Tell git to ignore vim's temporary files (#2957) ci: force exit tests if there are hanging promises ci: use different test coverage directories for each type (#2956)
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We would call
handler.throwIfCannotBeApplied(transaction, sender, databaseWalletManager);
followed by
handler.applyToSender(transaction, localWalletManager);
but applyToSender() calls throwIfCannotBeApplied() internally, so we
don't need to call it ourselves. Also, it was wrong to use the
databaseWalletManager in that call because we are applying the
transactions to localWalletManager, so the databaseWalletManager will be
outdated (e.g. sender nonce and balance will be stale in
databaseWalletManager).
So, remove the unnecessary call to throwIfCannotBeApplied().
A summary of what changes this PR introduces and why they were made.
What kind of change does this PR introduce?
Does this PR introduce a breaking change?
Does this PR release a new version?
If yes, please describe the impact and migration path for existing applications:
The PR fulfills these requirements:
developbranch, not themasterbranchIf adding a new feature, the PR's description includes: