[r2r] Implement methods used in recover_funds_of_swap for Tendermint. #1527
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
Also implemented validate_address. Add dummy error return for others to avoid occasional panics.
artemii235
changed the title
onur-ozkan
reviewed
Nov 3, 2022
| let request = GetTxsEventRequest { | ||
| events: vec![events_string], | ||
| pagination: None, | ||
| order_by: 0, |
There was a problem hiding this comment.
TendermintResultOrder::Ascending can be used here.
There was a problem hiding this comment.
@ozkanonur I got expected i32, found enum cosmrs::tendermint_rpc::Order error when tried to use it. TendermintResultOrder is used in tx_search and block_search, but not for GetTxsEventRequest.
There was a problem hiding this comment.
TendermintResultOrder::Ascending
I thught they implemented into for numbers. I will create new Order enum which implements TendermintResultOrder type and also can convert to i32. Since this PR is P0 I will do this refactoring on my side.
Comment on lines
1302
to
1324
| match AccountId::from_str(address) { | ||
| Ok(account) => { | ||
| if account.prefix() == self.account_prefix { | ||
| ValidateAddressResult { | ||
| is_valid: true, | ||
| reason: None, | ||
| } | ||
| } else { | ||
| ValidateAddressResult { | ||
| is_valid: false, | ||
| reason: Some(format!( | ||
| "Expected {} account prefix, got {}", | ||
| self.account_prefix, | ||
| account.prefix() | ||
| )), | ||
| } | ||
| } | ||
| }, | ||
| Err(e) => ValidateAddressResult { | ||
| is_valid: false, | ||
| reason: Some(e.to_string()), | ||
| }, | ||
| } |
There was a problem hiding this comment.
Less nested version:
match AccountId::from_str(address) {
Ok(account) if account.prefix() != self.account_prefix => ValidateAddressResult {
is_valid: false,
reason: Some(format!(
"Expected {} account prefix, got {}",
self.account_prefix,
account.prefix()
)),
},
Ok(_) => ValidateAddressResult {
is_valid: true,
reason: None,
},
Err(e) => ValidateAddressResult {
is_valid: false,
reason: Some(e.to_string()),
},
}There was a problem hiding this comment.
@ozkanonur Done, thanks for the note!
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.
Also implemented validate_address.
Add dummy error return for others to avoid occasional panics.
#1432
This is one more P0 required for the upcoming WebDEX release.