Skip to content

Commit

Permalink
Eth-connector: remove fee from deposit logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@karim-en
karim-en committed Dec 8, 2023
1 parent 1895601 commit 9543a00
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 40 deletions.
3 changes: 1 addition & 2 deletions engine-tests-connector/src/connector.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,7 @@ async fn test_deposit_with_0x_prefix() -> anyhow::Result<()> {
let message = [CONTRACT_ACC, ":", "0x", &recipient_address_encoded].concat();
let fee: Fee = Fee::new(NEP141Wei::new(0));
let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();

let deposit_event = DepositedEvent {
eth_custodian_address,
Expand Down
3 changes: 1 addition & 2 deletions engine-tests/src/tests/erc20_connector.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,7 @@ pub mod workspace {
let message = recipient_id.to_string();
let fee: Fee = Fee::new(NEP141Wei::new(0));
let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();

let deposit_event = DepositedEvent {
eth_custodian_address,
Expand Down
3 changes: 1 addition & 2 deletions engine-tests/src/tests/standalone/sync.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,7 @@ fn mock_proof(recipient_address: Address, deposit_amount: Wei) -> aurora_engine:
let fee = Fee::new(NEP141Wei::new(0));
let message = ["aurora", ":", recipient_address.encode().as_str()].concat();
let token_message_data: TokenMessageData =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();

let deposit_event = DepositedEvent {
eth_custodian_address,
Expand Down
42 changes: 10 additions & 32 deletions engine/src/contract_methods/connector/deposit_event.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ impl FtTransferMessageData {

/// Prepare message for `ft_transfer_call` -> `ft_on_transfer`
pub fn prepare_message_for_on_transfer(
relayer_account_id: &AccountId,
fee: Fee,
recipient: String,
) -> Result<Self, errors::ParseEventMessageError> {
let address = if recipient.len() == 42 {
Expand All @@ -143,10 +141,7 @@ impl FtTransferMessageData {
#[allow(deprecated)]
Ok(Self {
recipient: recipient_address,
fee: Some(FtTransferFee {
relayer: relayer_account_id.clone(),
amount: fee,
}),
fee: None,
})
}
}
Expand Down Expand Up @@ -175,7 +170,6 @@ impl TokenMessageData {
/// parsing for `ft_on_transfer` message parsing with correct and validated data.
pub fn parse_event_message_and_prepare_token_message_data(
message: &str,
fee: Fee,
) -> Result<Self, errors::ParseEventMessageError> {
let data: Vec<_> = message.split(':').collect();
// Data array can contain 1 or 2 elements
Expand All @@ -190,11 +184,7 @@ impl TokenMessageData {
Ok(Self::Near(account_id))
} else {
let raw_message = data[1].into();
let message = FtTransferMessageData::prepare_message_for_on_transfer(
&account_id,
fee,
raw_message,
)?;
let message = FtTransferMessageData::prepare_message_for_on_transfer(raw_message)?;

Ok(Self::Eth {
receiver_id: account_id,
Expand Down Expand Up @@ -327,7 +317,6 @@ impl DepositedEvent {
let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(
&event_message_data,
fee,
)?;

Ok(Self {
Expand Down Expand Up @@ -431,13 +420,11 @@ mod tests {

#[test]
fn test_eth_token_message_data_decodes_recipient_correctly() {
let fee = Fee::new(NEP141Wei::new(0));
let address = Address::zero();
let message = format!("aurora:{}", address.encode());

let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();
let actual_recipient = token_message_data.recipient().to_string();
let expected_recipient = "aurora";

Expand All @@ -446,13 +433,11 @@ mod tests {

#[test]
fn test_eth_token_message_data_decodes_recipient_correctly_with_prefix() {
let fee = Fee::new(NEP141Wei::new(0));
let address = Address::zero();
let message = format!("aurora:0x{}", address.encode());

let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();
let actual_recipient = token_message_data.recipient().to_string();
let expected_recipient = "aurora";

Expand All @@ -461,12 +446,10 @@ mod tests {

#[test]
fn test_near_token_message_data_decodes_recipient_correctly() {
let fee = Fee::new(NEP141Wei::new(0));
let message = "aurora";

let token_message_data =
TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(message).unwrap();
let actual_recipient = token_message_data.recipient().to_string();
let expected_recipient = "aurora";

Expand All @@ -475,11 +458,10 @@ mod tests {

#[test]
fn test_token_message_data_fails_with_too_many_parts() {
let fee = Fee::new(NEP141Wei::new(0));
let message = "aurora:foo:bar";

let parse_error =
TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee)
TokenMessageData::parse_event_message_and_prepare_token_message_data(message)
.unwrap_err();
let actual_parse_error = parse_error.as_ref();
let expected_parse_error = errors::ERR_INVALID_EVENT_MESSAGE_FORMAT;
Expand All @@ -489,11 +471,10 @@ mod tests {

#[test]
fn test_token_message_data_fails_with_invalid_account() {
let fee = Fee::new(NEP141Wei::new(0));
let message = "INVALID";

let parse_error =
TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee)
TokenMessageData::parse_event_message_and_prepare_token_message_data(message)
.unwrap_err();
let actual_parse_error = parse_error.as_ref();
let expected_parse_error = errors::ERR_INVALID_ACCOUNT_ID;
Expand All @@ -503,11 +484,10 @@ mod tests {

#[test]
fn test_eth_token_message_data_fails_with_invalid_address_length() {
let fee = Fee::new(NEP141Wei::new(0));
let message = "aurora:0xINVALID";

let parse_error =
TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee)
TokenMessageData::parse_event_message_and_prepare_token_message_data(message)
.unwrap_err();
let actual_parse_error = std::str::from_utf8(parse_error.as_ref()).unwrap();
let expected_parse_error = AddressError::IncorrectLength.to_string();
Expand All @@ -517,11 +497,10 @@ mod tests {

#[test]
fn test_eth_token_message_data_fails_with_invalid_address() {
let fee = Fee::new(NEP141Wei::new(0));
let message = "aurora:0xINVALID_ADDRESS_WITH_CORRECT_LENGTH_HERE";

let parse_error =
TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee)
TokenMessageData::parse_event_message_and_prepare_token_message_data(message)
.unwrap_err();
let actual_parse_error = std::str::from_utf8(parse_error.as_ref()).unwrap();
let expected_parse_error = AddressError::FailedDecodeHex.to_string();
Expand All @@ -537,8 +516,7 @@ mod tests {
let fee = Fee::new(NEP141Wei::new(0));
let message = ["aurora", ":", recipient_address.encode().as_str()].concat();
let token_message_data: TokenMessageData =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();

let expected_deposited_event = DepositedEvent {
eth_custodian_address,
Expand Down
3 changes: 1 addition & 2 deletions engine/src/contract_methods/connector/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,7 @@ mod tests {
let fee = Fee::new(NEP141Wei::new(0));
let message = ["aurora", ":", recipient_address.encode().as_str()].concat();
let token_message_data: TokenMessageData =
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee)
.unwrap();
TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap();

let deposit_event = DepositedEvent {
eth_custodian_address,
Expand Down

0 comments on commit 9543a00

Please sign in to comment.