Change objects to Maps #878
Merged
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
Contributor
liayoo
commented
Jan 3, 2022
liayoo
commented
- Updated objects in BlockPool and TransactionPool to Maps
- Related: Use Map instead of Object when additions and removals are frequent #797
platfowner
reviewed
Jan 3, 2022
| this.hashToBlockInfo[currentBlockInfo.block.hash].notarized = true; | ||
| this.updateLongestNotarizedChains(this.hashToBlockInfo[currentBlockInfo.block.hash]); | ||
| currentBlockInfo.notarized = true; | ||
| this.updateLongestNotarizedChains(); |
There was a problem hiding this comment.
question: no need to pass an argument?
There was a problem hiding this comment.
No.. updateLongestNotarizedChains() expects no arguments. I think I updated the function a while ago and forgot to update some of the invocations of it. Thanks for noticing it though!
There was a problem hiding this comment.
I see. Thanks for the explain.
platfowner
reviewed
Jan 3, 2022
| @@ -467,29 +474,31 @@ class BlockPool { | |||
| currentBlockInfo.tallied >= totalAtStake * ConsensusConsts.MAJORITY) { | |||
| logger.info(`[${LOG_HEADER}] Notarized block: ${currentBlockInfo.block.hash} ` + | |||
| `(${currentBlockInfo.block.number} / ${currentBlockInfo.block.epoch})`); | |||
| this.hashToBlockInfo[blockHash].notarized = true; | |||
| this.updateLongestNotarizedChains(this.hashToBlockInfo[blockHash]); | |||
platfowner
reviewed
Jan 3, 2022
block-pool/index.js
Outdated
| } | ||
| } | ||
| if (!this.numberToBlockSet[blockNumber].size) { | ||
| delete this.numberToBlockSet[blockNumber]; | ||
| if (!blockHashSet.size) { |
platfowner
reviewed
Jan 3, 2022
| @@ -148,10 +148,10 @@ class TransactionPool { | |||
| return null; | |||
| } | |||
|
|
|||
| const addrToTxList = JSON.parse(JSON.stringify(this.transactions)); | |||
| const addrToTxList = _.cloneDeep(this.transactions); | |||
platfowner
reviewed
Jan 3, 2022
tx-pool/index.js
Outdated
| return !(addrToTxSet[address].has(tx.hash)); | ||
| }) | ||
| for (const [address, txList] of addrToTxSet.entries()) { | ||
| const sizeBefore = txList ? txList.length : 0; |
There was a problem hiding this comment.
question: could txList be not a Set?
There was a problem hiding this comment.
Fixed some bugs in the logic & updated the variable names to make them clearer, thanks!
|
Addressed all comments, PTAL @platfowner |
platfowner
reviewed
Jan 4, 2022
| if (this.transactions.has(address)) { | ||
| const txList = this.transactions.get(address); | ||
| const sizeBefore = txList.length; | ||
| this.transactions.set(address, txList.filter((tx) => !invalidTxSet.has(tx.hash))); |
platfowner
approved these changes
Jan 4, 2022
|
Thanks for the review~ Now merging! |
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.