Prevents EthereumBlobExporter from consuming dest when returning NotApplicable #5789
+108
−2
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
bkontur
reviewed
Sep 20, 2024
| @@ -71,6 +71,8 @@ impl<UniversalLocation, EthereumNetwork, OutboundQueue, AgentHashedDescription, | |||
| let dest = destination.take().ok_or(SendError::MissingArgument)?; | |||
| if dest != Here { | |||
| log::trace!(target: "xcm::ethereum_blob_exporter", "skipped due to unmatched remote destination {dest:?}."); | |||
| // We need to make sure that destination is not consumed in case of `NotApplicable`. | |||
| *destination = Some(dest); | |||
There was a problem hiding this comment.
@claravanstaden
bellow there is a another usage:
if Ok(local_net) != universal_location.global_consensus() {
log::trace!(target: "xcm::ethereum_blob_exporter", "skipped due to unmatched relay network {local_net:?}.");
return Err(SendError::NotApplicable)
}
There was a problem hiding this comment.
I wondered about that one, because the comment only mentions dest and msg. But basically no mutable parameters should be altered when the error is NotApplicable?
There was a problem hiding this comment.
Fixed in bfc90ba. This case is easy to miss... Perhaps the parameters should not be mutable in the first place?
yrong
reviewed
Sep 22, 2024
| @@ -71,9 +71,13 @@ impl<UniversalLocation, EthereumNetwork, OutboundQueue, AgentHashedDescription, | |||
| let dest = destination.take().ok_or(SendError::MissingArgument)?; | |||
There was a problem hiding this comment.
How about just replace take here with clone without other reset operations?
There was a problem hiding this comment.
Good point, that is much better. :) 4fe4085
yrong
reviewed
Sep 22, 2024
Comment on lines
81
to
82
| let (local_net, local_sub) = universal_source | ||
| .take() |
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.
Description
The EthereumBlobExporter consumes the
destparameter when the destination is notHere. Subsequent exporters will receive aNonevalue for the destination instead of the original destination value, which is incorrect.Resolves #5788
Integration
Minor fix related to the exporter behaviour.
Review Notes
Verified that tests
exporter_validate_with_invalid_dest_does_not_alter_destinationandexporter_validate_with_invalid_universal_source_does_not_alter_universal_sourcefail without the fix in the exporter.