Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into mkl-market-id-feature #1302

Merged
merged 3 commits into from
Apr 7, 2024
Merged

Merge main into mkl-market-id-feature #1302

merged 3 commits into from
Apr 7, 2024

Conversation

maltekliemann
Copy link
Member

@maltekliemann maltekliemann commented Apr 4, 2024 •
edited
Loading

What does it do?

  • Merges main into mkl-market-id-feature.
  • Removes unused outcomes in neo-swaps.

What important points should reviewers know?

Is there something left for follow-up PRs?

What alternative implementations were considered?

Are there relevant PRs or issues?

References

@maltekliemann maltekliemann added the s:review-needed The pull request requires reviews label Apr 4, 2024
@mergify mergify bot added s:in-progress The pull requests is currently being worked on and removed s:review-needed The pull request requires reviews labels Apr 4, 2024
@codecov-commenter
Copy link

codecov-commenter commented Apr 4, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 87.10275% with 418 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (mkl-market-id-feature@2e79545). Click here to learn what that means.

Files Patch % Lines
zrml/asset-router/src/lib.rs 37.86% 302 Missing ⚠️
...rml/asset-router/src/pallet_impl/multi_currency.rs 84.35% 23 Missing ⚠️
zrml/asset-router/src/mock.rs 42.85% 20 Missing ⚠️
primitives/src/traits/market_transition_api.rs 91.89% 18 Missing ⚠️
primitives/src/assets/all_assets.rs 88.88% 8 Missing ⚠️
primitives/src/assets/currencies.rs 73.33% 8 Missing ⚠️
zrml/asset-router/src/pallet_impl/inspect.rs 90.66% 7 Missing ⚠️
primitives/src/types.rs 40.00% 6 Missing ⚠️
zrml/court/src/lib.rs 96.66% 4 Missing ⚠️
...-router/src/pallet_impl/multi_currency_extended.rs 92.68% 3 Missing ⚠️
... and 11 more

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@                   Coverage Diff                    @@
##             mkl-market-id-feature    #1302   +/-   ##
========================================================
  Coverage                         ?   91.85%           
========================================================
  Files                            ?      191           
  Lines                            ?    34577           
  Branches                         ?        0           
========================================================
  Hits                             ?    31760           
  Misses                           ?     2817           
  Partials                         ?        0
Flag Coverage Δ
tests 91.85% <87.10%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@maltekliemann maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Apr 5, 2024
sea212
sea212 reviewed Apr 5, 2024
View reviewed changes
Copy link
Member

@sea212 sea212 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two-way diff reveals that this is a proper merge, but it indicates that you are undoing some of your own changes, namely in:

  • primitives/src/types.rs
  • primitives/src/types/*

@maltekliemann
Copy link
Member Author

Yeah, that's intended. Those changes caused some conflicts, and they seemed to belong into a separate PR anyways, so I reverted them.

@maltekliemann maltekliemann self-assigned this Apr 5, 2024
@sea212 sea212 added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Apr 6, 2024
@mergify mergify bot merged commit 9df7e68 into mkl-market-id-feature Apr 7, 2024
23 checks passed
@mergify mergify bot deleted the mkl-market-id-feature-merge-main branch April 7, 2024 16:50
mergify bot pushed a commit that referenced this pull request Apr 12, 2024
@maltekliemann @Chralt98 @sea212
Add ID to Market struct (#1310)
bcb1421 
* Add market ID to `Market` struct (#1248)

* Add market ID to `Market` struct

* Add market builder struct

* Use `PredictionMarketBuilder`

* Fix issues

* Fix copyright

* Make `build` return a `Result`

* Let `build` raise an error on incomplete data.

* Fix formatting

* Refactor `MarketBuilder`

* Add missing files

* AMM-CDA-1: Switch to AmmCdaHybrid enum field (#1274)

* switch to AmmCdaHybrid enum field

* Update zrml/parimutuel/src/tests/buy.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update zrml/parimutuel/src/tests/claim.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update zrml/parimutuel/src/tests/refund.rs

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* Update storage version to 11 and add MigrateScoringRuleAmmCdaHybrid

* Update primitives/src/market.rs

* update migration

---------

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* merge amm-cda-3 changes

* merge amm-cda-2 changes

* merge amm-cda-4 changes

* correct clippy

* merge amm-cda-5 changes

* merge amm-cda-6 changes

* Fix Hybrid Router clippy and tests (#1291)

* glue everything together

* add hybrid router to configuration

* fix tests

* fix conditional tests

* AMM-CDA-8 Add event information for fees and aggregated amount_out (#1293)

* add event info

* use slice as function parameter

* update test amm amount out of event

* fix order book tests

* update documentation

* removed dependency

* Merge `main` into `mkl-market-id-feature` (#1302)

* Merge `main` into `mkl-mkl-market-id-feature`

* Remove unused `outcomes`

* Remove old migrations (#1301)

* AMM-CDA-9 Adds soft and hard failure distinction for AMM and order book errors (#1294)

* add event info

* use slice as function parameter

* update test amm amount out of event

* wip

* handle soft and hard failure

* add order book soft failure

* fix clippy

* fix CI

* remove swaps pallet dependency

* add compact to order book struct

* fix recursion overflow

* Migration: Add Market ID to Market (#1257)

* Add market ID to `Market` struct

* Add market builder struct

* Use `PredictionMarketBuilder`

* Fix issues

* Fix copyright

* Make `build` return a `Result`

* Let `build` raise an error on incomplete data.

* Fix formatting

* Refactor `MarketBuilder`

* Add missing files

* Add migration to new market

* Fix migration

* Fix missing import

* Fix duplicate import

* Fix formatting

* Remove unused `types/`

* Fix of Hybrid Router after asset system merge (#1309)

* wip

* use asset conversions

* adapt hybrid router to new asset system

* apply review suggestions

* fmt

* rename Asset to Assets

* update copyrights

* Make minor fixes after merge

* update hybrid router crate version

* correct orderbook spelling

* add amount is zero tests

* add price limit too high test

* add max order exceeded test

* use saturated conversion

* use saturated conversion again

* remove unused code

* Update changelog

* add tests for soft failures

* add skip order test

* add changelog for devs description

* add amm soft failure test

* add numerical soft failure test for sell

* Remove ZeitgeistAssetManager trait

* correct failing test for parachain feature

* cover remaining is zero execution path

* Fix try-runtime test

---------

Co-authored-by: Chralt <chralt.developer@gmail.com>
Co-authored-by: Chralt98 <chralt98@gmail.com>
Co-authored-by: Harald Heckmann <mail@haraldheckmann.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sea212 sea212 sea212 approved these changes

@yornaath yornaath Awaiting requested review from yornaath

@Chralt98 Chralt98 Awaiting requested review from Chralt98

Assignees

@maltekliemann maltekliemann

Labels
s:accepted This pull request is ready for merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maltekliemann @codecov-commenter @sea212