Remove TxTimlock from the mempool#12
Closed
remagpie wants to merge 4 commits intoCodeChain-io:masterfrom
Closed
Conversation
sgkim126
requested changes
Dec 19, 2019
core/src/miner/mem_pool.rs
Outdated
| || next_seq < current_seq | ||
| { | ||
| self.check_transactions(public, current_seq, inserted_block_number, inserted_timestamp) | ||
| self.check_transactions(public, current_seq) |
Contributor
There was a problem hiding this comment.
let target_seq = if current_seq < first_seq
|| inserted_block_number < self.last_block_number
|| inserted_timestamp < self.last_timestamp
|| inserted_timestamp < self.last_timestamp
|| next_seq < current_seq {
current_seq
} else {
next_seq
};
let new_next_seq = self.check_transactions(public, target_seq);| current_block_number: PoolingInstant, | ||
| current_timestamp: u64, | ||
| ) -> u64 { | ||
| fn check_transactions(&self, public: Public, start_seq: u64) -> u64 { |
Contributor
There was a problem hiding this comment.
Why does this function still remain?
It seems that this function was introduced because of a timelock.
Contributor
Author
There was a problem hiding this comment.
I think this function can be removed, but I couldn't since I didn't fully understand the mempool implementation yet.
It's returning some value derived from start_seq, and I'm not sure what it means.
core/src/miner/mem_pool.rs
Outdated
| let id = self.next_transaction_id; | ||
| self.next_transaction_id += 1; | ||
| let item = MemPoolItem::new(tx, origin, inserted_block_number, inserted_timestamp, id, timelock); | ||
| let item = MemPoolItem::new(tx, origin, inserted_block_number, inserted_timestamp, id, TxTimelock { |
remagpie
force-pushed
the
no-miner-timelock
branch
3 times, most recently
from
f552920 to
2fac811
Compare
Contributor
Author
|
Rebased to the latest master. |
remagpie
force-pushed
the
no-miner-timelock
branch
from
2fac811 to
f67556b
Compare
|
I created a new PR #120 with the same commits as this PR. I rebased these commits in the master branch. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Resolves #8
I think there might be some parts that can be further simplified, but I'm not sure about them for now.