This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
ethcore: fix ancient block import error handling #8832
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
andresilva
added
F3-annoyance 💩
andresilva
changed the title
5chdn
added
A0-pleasereview 🤓
tomusdrw
approved these changes
Jun 7, 2018
niklasad1
reviewed
Jun 7, 2018
| @@ -2073,15 +2073,16 @@ impl IoClient for Client { | |||
| let first = queued.write().1.pop_front(); | |||
| if let Some((header, block_bytes, receipts_bytes)) = first { | |||
| let hash = header.hash(); | |||
| client.importer.import_old_block( | |||
| let result = client.importer.import_old_block( | |||
There was a problem hiding this comment.
Just to clarify that I understand this correct, essentially map_or is used the inverse way here right?
Prints a error message when the Result is Ok and don't care when it is Err?
There was a problem hiding this comment.
Yes, exactly. We could change only .ok() to .err() and it would work, but I thought it was clearer using if let Err.
niklasad1
added
A8-looksgood 🦄
dvdplm
added a commit
that referenced
this pull request
Jun 7, 2018
…eric * origin/master: ethcore: fix ancient block error msg handling (#8832) CI: Fix docker tags (#8822) parity: fix indentation in sync logging (#8794) Removed obsolete IpcMode enum (#8819) Remove UI related settings from CLI (#8783) Remove windows tray and installer (#8778) docs: add changelogs for 1.10.6 and 1.11.3 (#8810) Fix ancient blocks queue deadlock (#8751) Disallow unsigned transactions in case EIP-86 is disabled (#8802) Fix evmbin compilation (#8795) Have space between feature cfg flag (#8791) rpc: fix address formatting in TransactionRequest Display (#8786) Conditionally compile ethcore public test helpers (#8743) Remove Result wrapper from AccountProvider in RPC impls (#8763) Update `license header` and `scripts` (#8666)
ordian
added a commit
to ordian/parity
that referenced
this pull request
Jun 7, 2018
* 'master' of https://github.com/paritytech/parity: ethcore: fix ancient block error msg handling (openethereum#8832)
This was referenced Jun 18, 2018
andresilva
added a commit
that referenced
this pull request
Jun 18, 2018
5chdn
pushed a commit
that referenced
this pull request
Jun 19, 2018
* `duration_ns: u64 -> duration: Duration` (#8457) * duration_ns: u64 -> duration: Duration * format on millis {:.2} -> {} * Keep all enacted blocks notify in order (#8524) * Keep all enacted blocks notify in order * Collect is unnecessary * Update ChainNotify to use ChainRouteType * Fix all ethcore fn defs * Wrap the type within ChainRoute * Fix private-tx and sync api * Fix secret_store API * Fix updater API * Fix rpc api * Fix informant api * Eagerly cache enacted/retracted and remove contain_enacted/retracted * Fix indent * tests: should use full expr form for struct constructor * Use into_enacted_retracted to further avoid copy * typo: not a function * rpc/tests: ChainRoute -> ChainRoute::new * Handle removed logs in filter changes and add geth compatibility field (#8796) * Add removed geth compatibility field in log * Fix mocked tests * Add field block hash in PollFilter * Store last block hash info for log filters * Implement canon route * Use canon logs for fetching reorg logs Light client removed logs fetching is disabled. It looks expensive. * Make sure removed flag is set * Address grumbles * Fixed AuthorityRound deadlock on shutdown, closes #8088 (#8803) * CI: Fix docker tags (#8822) * scripts: enable docker builds for beta and stable * scripts: docker latest should be beta not master * scripts: docker latest is master * ethcore: fix ancient block error msg handling (#8832) * Disable parallel verification and skip verifiying already imported txs. (#8834) * Reject transactions that are already in pool without verifying them. * Avoid verifying already imported transactions. * Fix concurrent access to signer queue (#8854) * Fix concurrent access to signer queue * Put request back to the queue if confirmation failed * typo: fix docs and rename functions to be more specific `request_notify` does not need to be public, and it's renamed to `notify_result`. `notify` is renamed to `notify_message`. * Change trace info "Transaction" -> "Request" * Don't allocate in expect_valid_rlp unless necessary (#8867) * don't allocate via format! in case there's no error * fix test? * fixed ipc leak, closes #8774 (#8876) * Add new ovh bootnodes and fix port for foundation bootnode 3.2 (#8886) * Add new ovh bootnodes and fix port for foundation bootnode 3.2 * Remove old bootnodes. * Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082 * Block 0 is valid in queries (#8891) Early exit for block nr 0 leads to spurious error about pruning: `…your node is running with state pruning…`. Fixes #7547, #8762 * Add ETC Cooperative-run load balanced parity node (#8892) * Minor fix in chain supplier and light provider (#8906) * fix chain supplier increment * fix light provider block_headers * Check whether we need resealing in miner and unwrap has_account in account_provider (#8853) * Remove unused Result wrap in has_account * Check whether we need to reseal for external transactions * Fix reference to has_account interface * typo: missing ) * Refactor duplicates to prepare_and_update_sealing * Fix build * Allow disabling local-by-default for transactions with new config entry (#8882) * Add tx_queue_allow_unknown_local config option - Previous commit messages: dispatcher checks if we have the sender account Add `tx_queue_allow_unknown_local` to MinerOptions Add `tx_queue_allow_unknown_local` to config fix order in MinerOptions to match Configuration add cli flag for tx_queue_allow_unknown_local Update refs to `tx_queue_allow_unknown_local` Add tx_queue_allow_unknown_local to config test revert changes to dispatcher Move tx_queue_allow_unknown_local to `import_own_transaction` Fix var name if statement should return the values derp de derp derp derp semicolons Reset dispatch file to how it was before fix compile issues + change from FLAG to ARG add test and use `into` import MinerOptions, clone the secret Fix tests? Compiler/linter issues fixed Fix linter msg - case of constants IT LIVES refactor to omit yucky explict return update comments Fix based on diff AccountProvider.has_account method * Refactor flag name + don't change import_own_tx behaviour fix arg name Note: force commit to try and get gitlab tests working again 😠 * Add fn to TestMinerService * Avoid race condition from trusted sources - refactor the miner tests a bit to cut down on code reuse - add `trusted` param to dispatch_transaction and import_claimed_local_transaction Add param to `import_claimed_local_transaction` Fix fn sig in tests
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The existing code was discarding the error and printing the error message on every successful ancient block import.