Liquidity pools: Add UTs to for `update_token_price()` #1890

lemunozm · 2024-06-27T10:06:14Z

Description

UTs for update_token_price()

NOTE: It's not directly related to LPv2

Changes and Descriptions

Token price simplification removed some unused types & traits.
Remove the IT related to this.
Add UTs covering the possible errors.

lemunozm · 2024-06-27T10:07:15Z

libs/traits/src/lib.rs

-/// A trait that can be used to retrieve the current price for a currency
-pub struct CurrencyPair<CurrencyId> {
-	pub base: CurrencyId,
-	pub quote: CurrencyId,
-}
-
-pub struct PriceValue<CurrencyId, Rate, Moment> {
-	pub pair: CurrencyPair<CurrencyId>,
-	pub price: Rate,
-	pub last_updated: Moment,
-}
-
-pub trait CurrencyPrice<CurrencyId> {
-	type Rate;
-	type Moment;
-
-	/// Retrieve the latest price of `base` currency, denominated in the `quote`
-	/// currency If `quote` currency is not passed, then the default `quote`
-	/// currency is used (when possible)
-	fn get_latest(
-		base: CurrencyId,
-		quote: Option<CurrencyId>,
-	) -> Option<PriceValue<CurrencyId, Self::Rate, Self::Moment>>;
-}
-


This is not used, but if it's intended to be used very soon, I can revert this. Otherwise, I would left removed.

wischli

LGTM!

codecov · 2024-06-27T17:41:18Z

Codecov Report

Attention: Patch coverage is 64.28571% with 5 lines in your changes missing coverage. Please review.

Project coverage is 46.11%. Comparing base (9a78356) to head (94b8f46).

Files	Patch %	Lines
runtime/common/src/oracle.rs	0.00%	3 Missing ⚠️
pallets/liquidity-pools/src/lib.rs	66.66%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1890      +/-   ##
==========================================
+ Coverage   46.04%   46.11%   +0.07%     
==========================================
  Files         179      179              
  Lines       13093    13092       -1     
==========================================
+ Hits         6029     6038       +9     
+ Misses       7064     7054      -10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mustermeiszer

Please do not merge until hieronx answered. I also would like to close the conversion in the same run too

mustermeiszer · 2024-07-01T08:22:05Z

pallets/pool-system/src/impls.rs

 		let price = prices.get(tranche_index).cloned()?;

-		Some(PriceValue {


@hieronx you added this change. Why did you wanted to have the TrancheCurrency and the PoolCurrency named here?

I don't fully remember. I think we just set up the PriceValue for some other purpose, and then used that here.

mustermeiszer · 2024-07-01T08:22:29Z

pallets/liquidity-pools/src/lib.rs

@@ -426,7 +426,7 @@ pub mod pallet {
 			// TODO(future): Once we diverge from 1-to-1 conversions for foreign and pool
 			// currencies, this price must be first converted into the currency_id and then
 			// re-denominated to 18 decimals (i.e. `Ratio` precision)
-			let price_value = T::TrancheTokenPrice::get(pool_id, tranche_id)
+			let (price, computed_at) = T::TrancheTokenPrice::get_price(pool_id, tranche_id)


@lemunozm can we in the same run also close this todo and computed the conversion?

I'm not sure if it's super straightforward. Do we need to add the order-book dependency to know the market price used for foreign/pool currencies?

I agree it isn't. But we are not only touching the UTs here but also chaning the return types, naming etc. Then we could also close the todo IMO.

Done here: 15424a8 @mustermeiszer

Nice, thanks a lot!

mustermeiszer

The MarketRatio type should provide a Rate::one() in case the currencies are equal. From my perspective we can adapt OracleRatioProviderLocalAssetExtension or write a new one.

Otherwise, looks good.

mustermeiszer · 2024-07-03T10:40:14Z

pallets/liquidity-pools/src/lib.rs

@@ -426,7 +426,7 @@ pub mod pallet {
 			// TODO(future): Once we diverge from 1-to-1 conversions for foreign and pool
 			// currencies, this price must be first converted into the currency_id and then
 			// re-denominated to 18 decimals (i.e. `Ratio` precision)
-			let price_value = T::TrancheTokenPrice::get(pool_id, tranche_id)
+			let (price, computed_at) = T::TrancheTokenPrice::get_price(pool_id, tranche_id)


Nice, thanks a lot!

lemunozm · 2024-07-08T12:45:01Z

Good catch!

I've decided to merge the behavior into OracleRatioProviderLocalAssetExtension to avoid having different providers for each change we'll do to the prices.

Commit: 662b8a1

mustermeiszer

Thanks! LGTM!

fix: adapt passthrough router fix: docs and hash chore: rm unused test Release v0.11.3 (#1886) * Switch to full wasm execution * feat: use correct encoded size. * fix: lint * refactor: reduce dev session duration from 6h to 2min * chore: update centrifuge weights * chore: update dev weights * chore: update altair weights * chore: update frame_system weights * fmt * fix: re-enable frame_system benches * chore: bump spec version * fmt: revert using latest nightly * v0.11.3-rc1: revert checkmetadata ext * feat: `CheckMetadataHash` extension (#1865) * set dependency versions * upgrade libs/* * upgrade pallet-anchors * upgrade pallet-fees * upgrade pallet-bridge * migrate simple pallets * migrate pallet-order-book * migrated collator-allowlist & swaps * upgrade rewards * upgraded pallet-mux * upgrade transfer-allowlist * fix hold reason in restricted tokens * simplify set_balance removing the holding part * upgrade restricted-xtokens * upgrade some pallets * upgrade pallet-ethereum-transaction * upgrade pallet-loans * upgrade pool-system * upgrade pool-fees * upgrade pool-registry * upgrade liquidity-pools stuffs * avoid duplicated polkadot-sdk repos * minor fixes * upgraded runtime-common * CfgLocation to RestrictedTransferLocation * restricted tokens with NativeIndex for native fungibles * rename dependency * upgraded development-runtime * fix partially benchmarks * fix benchmarks * overpass xcmp-queue integrity tests * minor coments * upgrade altair & centrifuge * remove some benchmarking pallets that are not needed * fix runtime upgrades * upgrade integration-test proc * upgrade integration-tests framework * upgraded all tests except liquidity pools * 99% upgraded liquidity-pools tests * fix lookup * cargo fmt * taplo fmt * using nightly cargo in CI * restore set_balance as it was * allow nightly support in CI * use restricted_tokens again to fetch from investement portfolio * Install rust-src for docs * fix tests * remove unused restricted tokens * fix block rewards * fix WrongWitness for some tests in IT * fix liquidity-pools * minor fixes * fix clippy * remove unneeded tests * feat: Update client to Polkadot v1.7.2 (#1844) * wip: update client * chore: update crate versions * chore: update anchor rpc api * chore: remove rewards, pools rpc * chore: compile with development runtime * fix: client for all runtimes * fix: build spec * feat: update relay docker images * fix: apply deprecation of export genesis state to scripts * fmt: taplo * refactor: use xcm v4 sugar * fix: revert tmp change in local para run * refactor: simplify xcm v4 locations in chain spec * cargo fmt * fix clippy * feat: Polkadot v1.7.2 migrations (#1849) * feat: add hold reason migration * feat: centrifuge migrations * feat: altair migrations * feat: dev + demo migrations * fix: clippy * fix: build * fmt: fix using nightly * last William iteration review * increase passed blocks * use rococo instead of polkadot-test-runtime * fix tests * remove line * dirty fix to fix Hrmp test issue * use default weights for treasury * remove getrandom unused dep * upgrade to last polkadot-sdk version * feat: `CheckMetadataHash` extension * fix it (#1866) * fmt: taplo * refactor: signed ext order * fix: signed ext order for ITs * IT: more support for router tests (#1885) * move routers to its own module * remove outdated markers * for all runtimes * remove previous tests * minor fixes * v0.11.2 rc * panic if event is not found in the expected blocks (#1880) * fix: ci * remove generic module (#1887) * revert check metadata hash disable * fix: disable metadata hash check for integration tests --------- Co-authored-by: lemunozm <lemunozm@gmail.com> --------- Co-authored-by: Bastian Köcher <info@kchr.de> Co-authored-by: Frederik Gartenmeister <mustermeiszer@posteo.de> Co-authored-by: lemunozm <lemunozm@gmail.com> Refactor: Decoupling routers from gateway (#1891) * decoupling routers from gateway. Use Vec<u8> * gateway adapted * fix imports * move test msg to cfg-traits * fix imports feat: Open Gov for Development and Altair Runtimes (#1828) * chore: add OpenGov pallets to root toml * feat: add OpenGov tracks to runtime common * feat: add technical committee migration tc: fix clippy * refactor: move origins from primitives to common common: fix typo common: fix test after HalfOfCouncil refactor * feat: add OpenGov to Development fix: complete Development OpenGov development: finalize opengov development: add proxy calls development: overwrite missing origins dev: fix treasury spender dev: remove crowdloan pallets dev: taplo fmt * feat: add OpenGov to Altair fix: complete Altair OpenGov fix: add missing technical fellowship weights Altair altair: finalize opengov altair: rename track tests altair: gather imports altair: remove crowdloan pallets altair: taplo fmt * feat: add OpenGov to Centrifuge chain fix: centrifuge toml chore: minor centrifuge chain improvements refactor: Centrifuge OpenGov centrifuge: finalize opengov centrifuge: fix cargo tml cfg: fix clippy test * Revert "feat: add OpenGov to Centrifuge chain" This reverts commit 4d78c10. * fix: clippy * tests: fix CouncilCollective import path * fix: technical committee migrations * altair: configure tc migration (incomplete) * dev: configure tc migration * chore: cleanup altair dep diff * chore: remove unused getrandom crate from runtimes * chore: add missing Altair TC members * refactor: move to_ppm and to_percent to utils * Merge remote-tracking branch 'origin/main' into feat/open-gov-2 * fix: issues after rebasing * fmt * fix: imports * feat: v0.12.0 for altair RU Altair: release v0.12.0 (#1896) * fix: altair chain spec * chore: update gov2 weights * chore: update dev OpenGov weights * fix: weight declaration Fix RustDocs deployment & codecov patch checks (#1870) * Fix deploy docs * Make patch checks also informational (not fail) LP Message with custom data format for serialization/deserialization (#1889) * test compiling * fix Domain serialization * fix issues * some reorganizations * using bincode 2 with non-std support * use custom trait * tests passing for lp * remove ENCODED_MSG constant * fix runtimes compilation * cargo fmt & taplo fmt * cargo clippy * minor change * add custom serializer passing all tests * no_std support * minor renames * cargo fmt * cargo clippy * minor comment change * cargo fmt extra Succeed when patch codecov fails (#1900) Liquidity pools: Add UTs to for `update_token_price()` (#1890) * add token price UTs * update IT * fix tests compilation remove some unused code investment-related (#1902) Release v0.13.0 (#1898) * chore: update deps to enable metadata hash check * chore: update srtool + add on-chain-release-build opts * chore: bump spec versions + cleanup migrations * fmt: taplo * ci: fix srtool fmt * ci: apply proper CLI * attempt2 to enable on-chain-release-build * change srtool build for chevdor/strool-actions action * desperate attempts to get it working * override workdir * Try to set permissions wide open before running docker * add RUST_BACKTRACE * revert to our GHA manual process & add enhancements * fix package name * Output information about srtool * Revert "desperate attempts to get it working" This reverts commit a882fd9. * fix: some scripts * fix bad colon on echo command * Fix missing colon and remove docker publish release * upload wasm to release * fix issue with gchr tags * more semicolon issues * unique name for delete untagged * fix delete_untagged * move delete_untagged under workflows * move delete untagged to manual runs * review bash syntax for wasm build * recover cache and limit sanity check build time --------- Co-authored-by: Guillermo Perez <gpmayorga@users.noreply.github.com> cargo update (#1904) add uts (#1905) IT: Support `#ignore = reason` for `test_runtimes` macro (#1908) * support #ignore = reason for test_runtimes macro * fix clippy ci: disable checks for drafts (#1913) LP: Unitary testing for add_currency (#1912) * port add-currency tests into uts * remove LiquidityPoolsWrappedToken struct * remove unused code * fix compilation issues * fix clippy * fix clippy feat: adatpt to latest version LP: Unitary testing for all pending extrinsics (#1916) * allow and disallow currency tests * schedule_upgrade cancel_upgrade and update_tranche_token_metadata Feat: Adapt proxy settings (#1922) * feat: adapt proxy settings * fix: match pattern Small CI improvements (#1924) LP: Unitary testing for inbound messages (#1927) * tests inbound messages * some cleanings * some adjustements fix: array size fix: clippy + fmt fix: update blake hash fix: compilation Refactor: Transform `TrancheCurrency` type in a tuple (#1926) * remove TrancheCurrency type * fix benchmarks * fix clippy fix: std import KeccakHasher

lemunozm added 2 commits June 27, 2024 11:58

add token price UTs

55d661f

update IT

3557b4f

lemunozm added I4-tests Test needs fixing or improving. crcl-protocol Circle protocol related. I11-cleaning No mandatory issue that leave the repo more readable/organized labels Jun 27, 2024

lemunozm requested review from cdamian, wischli and mustermeiszer June 27, 2024 10:06

lemunozm self-assigned this Jun 27, 2024

lemunozm commented Jun 27, 2024

View reviewed changes

wischli previously approved these changes Jun 27, 2024

View reviewed changes

fix tests compilation

2060f44

lemunozm dismissed wischli’s stale review via 2060f44 June 27, 2024 16:10

lemunozm enabled auto-merge (squash) June 27, 2024 22:10

lemunozm added 2 commits June 28, 2024 13:16

Merge remote-tracking branch 'origin/main' into lp/token-price-uts

1d9d4a6

Merge remote-tracking branch 'origin/main' into lp/token-price-uts

b0b3ce4

mustermeiszer reviewed Jul 1, 2024

View reviewed changes

lemunozm added 3 commits July 3, 2024 08:51

apply market ratio to token price

15424a8

Merge remote-tracking branch 'origin/main' into lp/token-price-uts

0868b0a

Merge remote-tracking branch 'origin/main' into lp/token-price-uts

d311c90

mustermeiszer requested changes Jul 8, 2024

View reviewed changes

lemunozm added 2 commits July 8, 2024 14:43

fix merge

5f87cba

ratio one for same currencies

662b8a1

fix compilation after rebase

94b8f46

lemunozm requested a review from mustermeiszer July 8, 2024 15:29

mustermeiszer approved these changes Jul 9, 2024

View reviewed changes

lemunozm merged commit e784233 into main Jul 9, 2024
12 checks passed

lemunozm deleted the lp/token-price-uts branch July 9, 2024 04:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Liquidity pools: Add UTs to for `update_token_price()` #1890

Liquidity pools: Add UTs to for `update_token_price()` #1890

lemunozm commented Jun 27, 2024

lemunozm Jun 27, 2024 •

edited

Loading

wischli left a comment

codecov bot commented Jun 27, 2024 •

edited

Loading

mustermeiszer left a comment

mustermeiszer Jul 1, 2024

hieronx Jul 1, 2024

mustermeiszer Jul 1, 2024

lemunozm Jul 1, 2024

mustermeiszer Jul 2, 2024

lemunozm Jul 3, 2024

mustermeiszer Jul 3, 2024

mustermeiszer left a comment

mustermeiszer Jul 3, 2024

lemunozm commented Jul 8, 2024

mustermeiszer left a comment

		let price = prices.get(tranche_index).cloned()?;

		Some(PriceValue {

Liquidity pools: Add UTs to for update_token_price() #1890

Liquidity pools: Add UTs to for update_token_price() #1890

Conversation

lemunozm commented Jun 27, 2024

Description

Changes and Descriptions

lemunozm Jun 27, 2024 • edited Loading

Choose a reason for hiding this comment

wischli left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 27, 2024 • edited Loading

Codecov Report

mustermeiszer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mustermeiszer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lemunozm commented Jul 8, 2024

mustermeiszer left a comment

Choose a reason for hiding this comment

Liquidity pools: Add UTs to for `update_token_price()` #1890

Liquidity pools: Add UTs to for `update_token_price()` #1890

lemunozm Jun 27, 2024 •

edited

Loading

codecov bot commented Jun 27, 2024 •

edited

Loading