Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
wischli committed Apr 15, 2024
1 parent 5903a10 commit 53f9fcf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pallets/pool-system/src/pool_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pub struct PoolEssence<CurrencyId, Balance, TrancheCurrency, Rate, StringLimit>
where
CurrencyId: Copy,
StringLimit: Get<u32>,
TrancheCurrency: Into<CurrencyId>,
TrancheCurrency: Into<CurrencyId>,
{
/// Currency that the pool is denominated in (immutable).
pub currency: CurrencyId,
Expand Down
3 changes: 1 addition & 2 deletions pallets/pool-system/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2478,8 +2478,7 @@ fn essence() {

let pool_details = Pool::<Runtime>::get(DEFAULT_POOL_ID).expect("Pool is registered; qed");
let essence = pool_details
.essence::<<Runtime as Config>::AssetRegistry, Balance, MaxTokenNameLength, MaxTokenSymbolLength>(
)
.essence::<<Runtime as Config>::AssetRegistry, Balance, StringLimit>()
.expect("Tranche token metadata is registered; qed");

assert_eq!(essence.currency, AUSD_CURRENCY_ID);
Expand Down

0 comments on commit 53f9fcf

Please sign in to comment.