Skip to content

Commit

Permalink
refactor: event Approve -> Approval
Browse files Browse the repository at this point in the history
  • Loading branch information
peterwht committed Sep 13, 2024
1 parent b38aede commit 35bedb6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions pallets/api/src/fungibles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub mod pallet {
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
/// Event emitted when allowance by `owner` to `spender` changes.
Approve {
Approval {
/// The token.
token: TokenIdOf<T>,
/// The owner providing the allowance.
Expand Down Expand Up @@ -278,7 +278,7 @@ pub mod pallet {
}
},
};
Self::deposit_event(Event::Approve { token, owner, spender, value });
Self::deposit_event(Event::Approval { token, owner, spender, value });
Ok(Some(weight).into())
}

Expand Down Expand Up @@ -306,7 +306,7 @@ pub mod pallet {
)
.map_err(|e| e.with_weight(AssetsWeightInfoOf::<T>::approve_transfer()))?;
let value = AssetsOf::<T>::allowance(token.clone(), &owner, &spender);
Self::deposit_event(Event::Approve { token, owner, spender, value });
Self::deposit_event(Event::Approval { token, owner, spender, value });
Ok(().into())
}

Expand Down Expand Up @@ -352,7 +352,7 @@ pub mod pallet {
)?;
WeightOf::<T>::approve(1, 1)
};
Self::deposit_event(Event::Approve { token, owner, spender, value: new_allowance });
Self::deposit_event(Event::Approval { token, owner, spender, value: new_allowance });
Ok(Some(weight).into())
}

Expand Down
16 changes: 8 additions & 8 deletions pallets/api/src/fungibles/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ mod approve {
Ok(Some(WeightInfo::approve(1, 0)).into())
);
assert_eq!(Assets::allowance(token, &owner, &spender), value);
System::assert_last_event(Event::Approve { token, owner, spender, value }.into());
System::assert_last_event(Event::Approval { token, owner, spender, value }.into());
// Approves a value to spend that is lower than the current allowance.
assert_eq!(
Fungibles::approve(signed(owner), token, spender, value / 2),
Ok(Some(WeightInfo::approve(1, 1)).into())
);
assert_eq!(Assets::allowance(token, &owner, &spender), value / 2);
System::assert_last_event(
Event::Approve { token, owner, spender, value: value / 2 }.into(),
Event::Approval { token, owner, spender, value: value / 2 }.into(),
);
// Approves a value to spend that is equal to the current allowance.
assert_eq!(
Expand All @@ -212,15 +212,15 @@ mod approve {
);
assert_eq!(Assets::allowance(token, &owner, &spender), value / 2);
System::assert_last_event(
Event::Approve { token, owner, spender, value: value / 2 }.into(),
Event::Approval { token, owner, spender, value: value / 2 }.into(),
);
// Sets allowance to zero.
assert_eq!(
Fungibles::approve(signed(owner), token, spender, 0),
Ok(Some(WeightInfo::approve(0, 1)).into())
);
assert_eq!(Assets::allowance(token, &owner, &spender), 0);
System::assert_last_event(Event::Approve { token, owner, spender, value: 0 }.into());
System::assert_last_event(Event::Approval { token, owner, spender, value: 0 }.into());
});
}
}
Expand Down Expand Up @@ -248,12 +248,12 @@ fn increase_allowance_works() {
assert_eq!(0, Assets::allowance(token, &owner, &spender));
assert_ok!(Fungibles::increase_allowance(signed(owner), token, spender, value));
assert_eq!(Assets::allowance(token, &owner, &spender), value);
System::assert_last_event(Event::Approve { token, owner, spender, value }.into());
System::assert_last_event(Event::Approval { token, owner, spender, value }.into());
// Additive.
assert_ok!(Fungibles::increase_allowance(signed(owner), token, spender, value));
assert_eq!(Assets::allowance(token, &owner, &spender), value * 2);
System::assert_last_event(
Event::Approve { token, owner, spender, value: value * 2 }.into(),
Event::Approval { token, owner, spender, value: value * 2 }.into(),
);
});
}
Expand Down Expand Up @@ -293,15 +293,15 @@ fn decrease_allowance_works() {
);
assert_eq!(Assets::allowance(token, &owner, &spender), value / 2);
System::assert_last_event(
Event::Approve { token, owner, spender, value: value / 2 }.into(),
Event::Approval { token, owner, spender, value: value / 2 }.into(),
);
// Saturating if current allowance is decreased more than the owner balance.
assert_eq!(
Fungibles::decrease_allowance(signed(owner), token, spender, value),
Ok(Some(WeightInfo::approve(0, 1)).into())
);
assert_eq!(Assets::allowance(token, &owner, &spender), 0);
System::assert_last_event(Event::Approve { token, owner, spender, value: 0 }.into());
System::assert_last_event(Event::Approval { token, owner, spender, value: 0 }.into());
});
}

Expand Down

0 comments on commit 35bedb6

Please sign in to comment.