Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Transaction Queue integration #595

Merged
merged 9 commits into from Mar 5, 2016
Merged

Transaction Queue integration #595

merged 9 commits into from Mar 5, 2016

Conversation

tomusdrw
Copy link
Collaborator

@tomusdrw tomusdrw commented Mar 5, 2016

Fixes 2&3 from #584 .

On good block we remove transactions from TransactionQueue.
For each "bad" block we insert transactions back to TransactionQueue.

Tests are modified to support blocks with transactions.

Most significant change: Changing order of block insertion: first we commit db and after that we insert block to blockchain (To avoid race when asking for state)

@tomusdrw tomusdrw changed the title Tx queue integration Transaction Queue integration Mar 5, 2016
@tomusdrw tomusdrw added the A0-pleasereview 🤓 Pull request needs code review. label Mar 5, 2016
@gavofyork
Copy link
Contributor

Guessing rather than "bad", you mean retracted.

fn fetch_transactions(chain: &BlockChainClient, hash: &H256) -> Vec<SignedTransaction> {
let block = chain
.block(BlockId::Hash(hash.clone()))
.expect("Expected in-chain blocks.");
Copy link
Contributor

Choose a reason for hiding this comment

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

should include a short comment as to why, by design, this can never fail.

@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 5, 2016
@gavofyork
Copy link
Contributor

looks fine in general. will probably need moving to ethcore prior to being of use though.

NikVolf added a commit that referenced this pull request Mar 5, 2016
@NikVolf NikVolf merged commit c4fe307 into master Mar 5, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants