This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Correct log index in transaction receipt #3995
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
tomusdrw
added
A0-pleasereview 🤓
tomusdrw
added
A0-pleasereview 🤓
rphmeier
reviewed
Dec 29, 2016
| @@ -1535,6 +1499,52 @@ impl Drop for Client { | |||
| } | |||
| } | |||
|
|
|||
| fn transaction_receipt(transaction: Option<LocalizedTransaction>, receipts: Option<Vec<Receipt>>) -> Option<LocalizedReceipt> { | |||
| let tx_and_sender = transaction | |||
| .and_then(|tx| tx.sender().ok().map(|sender| (tx, sender))); | |||
There was a problem hiding this comment.
having this check within the body (and corresponding match for the output) is a bit weird.
fn transaction_receipt(LocalizedTransaction, Address, Vec<Receipt>) -> LocalizedReceipt seems like a cleaner interface.
a comment explaining what it does would be nice too. although it seems to me that actually you just need a fn(Transaction, Address, Receipt, usize) to do the same thing.
There was a problem hiding this comment.
This function is not really needed at all, but it is very difficult to test Client::transaction_receipt so I wanted to move as much logic as possible here to be able to test it properly.
Also most of the options could be replaced with .expect("Blockchain database is never pruned and stays consistent.") but I think current approach with .and_then chain is more future proof.
I will move Options to Client::transaction_receipt
tomusdrw
added
A3-inprogress ⏳
tomusdrw
added
A0-pleasereview 🤓
rphmeier
approved these changes
Dec 29, 2016
rphmeier
added
A8-looksgood 🦄
This was referenced Jan 2, 2017
tomusdrw
added a commit
that referenced
this pull request
Jan 3, 2017
* Moving logs to separate, testable function * Adding test * Fixing log index * Adding transaction log index * Fixing rpc tests * Making interface of a bit cleaner. Conflicts: ethcore/src/client/client.rs ethcore/src/tests/client.rs ethcore/src/types/transaction.rs
Merged
gavofyork
pushed a commit
that referenced
this pull request
Jan 5, 2017
* Fix up the transaction JSON serialisation for RPC. * Introduce to_hex() utility in bigint. Fix tests. Conflicts: rpc/src/v1/tests/mocked/eth.rs rpc/src/v1/tests/mocked/signing.rs rpc/src/v1/types/block.rs rpc/src/v1/types/transaction.rs * fix comment * Fix build. * Bump hyper * Correct log index in transaction receipt (#3995) * Moving logs to separate, testable function * Adding test * Fixing log index * Adding transaction log index * Fixing rpc tests * Making interface of a bit cleaner. Conflicts: ethcore/src/client/client.rs ethcore/src/tests/client.rs ethcore/src/types/transaction.rs * Encode networkid as a u64. Conflicts: ethcore/src/types/transaction.rs * Fixing compilation issues * parse testnet chain as ropsten * Removing unused import
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.
Fixes
log_indexto meanlog index in blockconsistently.Introduces
transaction_log_index.Closes #3601, #2075, #3537