Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Contracts: fix benchmark comment #14316

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Contracts: fix benchmark comment #14316

merged 1 commit into from
Jun 7, 2023

Conversation

pgherveou
Copy link
Contributor

No description provided.

@pgherveou pgherveou requested a review from athei as a code owner June 7, 2023 10:21
@pgherveou pgherveou requested a review from a team June 7, 2023 10:21
juangirini
juangirini suggested changes Jun 7, 2023
View reviewed changes
Copy link
Contributor

@juangirini juangirini left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This is still used here

substrate/frame/contracts/src/migration.rs

Lines 325 to 328 in e7eb188

MigrationInProgress::<T>::mutate_exists(|progress| {
let Some(cursor_before) = progress.as_mut() else {
return (MigrateResult::NoMigrationInProgress, T::WeightInfo::migration_noop())
};

agryaznov
agryaznov suggested changes Jun 7, 2023
View reviewed changes
Copy link
Contributor

@agryaznov agryaznov left a comment

Choose a reason for hiding this comment

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

I think we should keep this migration, as the second one actually tests dispatchable.

@pgherveou
Copy link
Contributor Author

This is still used here

substrate/frame/contracts/src/migration.rs

Lines 325 to 328 in e7eb188

MigrationInProgress::<T>::mutate_exists(|progress| {
let Some(cursor_before) = progress.as_mut() else {
return (MigrateResult::NoMigrationInProgress, T::WeightInfo::migration_noop())
};

ah my bad, missed that in my grep, will just use this PR to amend the other docstring comment then

@pgherveou pgherveou force-pushed the pg/rm_unused_migration_bench branch from e7eb188 to ecb29f2 Compare June 7, 2023 11:03
@pgherveou pgherveou changed the base branch from jg/remove-default-migrate-sequence to master June 7, 2023 11:03
@pgherveou pgherveou force-pushed the pg/rm_unused_migration_bench branch from ecb29f2 to f3efa67 Compare June 7, 2023 11:04
@pgherveou pgherveou changed the title Contracts: remove unused migration benchmarks Contracts: fix benchmark comment Jun 7, 2023
@pgherveou pgherveou added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit labels Jun 7, 2023
@agryaznov
Copy link
Contributor

ah my bad, missed that in my grep, will just use this PR to amend the other docstring comment then

I don't think a docstring fix worth a standalone PR. Could you pls add it up to #14313 or some other bigger change

@pgherveou pgherveou changed the base branch from master to pg/more_migratinons_per_block June 7, 2023 13:17
@pgherveou pgherveou merged commit 137ecc8 into pg/more_migratinons_per_block Jun 7, 2023
17 of 19 checks passed
@pgherveou pgherveou deleted the pg/rm_unused_migration_bench branch June 7, 2023 13:18
paritytech-processbot bot pushed a commit that referenced this pull request Jun 20, 2023
@pgherveou @juangirini @agryaznov
Update contract multi-block migration (#14313)
8bf628d 
* move migrate sequence to config

* remove commented out code

* Update frame/contracts/src/lib.rs

Co-authored-by: PG Herveou <pgherveou@gmail.com>

* remove Migrations generic

* make runtime use noop migrations

* restrict is_upgrade_supported

* Update contract multi-block migration

Ensure that we do as many steps as possible given the weight limit passed to on_idle

* undo is_upgrade_supported change

* Update bin/node/runtime/src/lib.rs

Co-authored-by: PG Herveou <pgherveou@gmail.com>

* wip

* fix comment (#14316)

* fix test

* fix

* Update frame/contracts/src/migration.rs

Co-authored-by: Juan <juangirini@gmail.com>

* fix test doc

* Apply suggestions from code review

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Fix compilation with feature runtime-benchmarks

* fix example

* fix  cargo doc --document-private-items

* private links

* Remove dup comment

* add doc for MigrationInProgress

* PR review remove duplicate asserts

* simplify upper bound

* fix link

* typo

* typo

* no unwrap()

* correct log message

* missing

* fix typo

* PR comment

* Add example with single element tuple

* Improve migration message

* Update frame/contracts/src/benchmarking/mod.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Update frame/contracts/src/migration.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Update frame/contracts/src/migration.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* use saturating_accrue instead of +=

* add more doc

* Contracts: Better migration types (#14418)

* Add explicit error, if try-runtime runs a noop migration

* use mut remaining_weight

---------

Co-authored-by: Juan Girini <juangirini@gmail.com>
Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>
nathanwhit pushed a commit to nathanwhit/substrate that referenced this pull request Jul 19, 2023
@pgherveou @juangirini
@agryaznov @nathanwhit
Update contract multi-block migration (paritytech#14313)
ccb4e91 
* move migrate sequence to config

* remove commented out code

* Update frame/contracts/src/lib.rs

Co-authored-by: PG Herveou <pgherveou@gmail.com>

* remove Migrations generic

* make runtime use noop migrations

* restrict is_upgrade_supported

* Update contract multi-block migration

Ensure that we do as many steps as possible given the weight limit passed to on_idle

* undo is_upgrade_supported change

* Update bin/node/runtime/src/lib.rs

Co-authored-by: PG Herveou <pgherveou@gmail.com>

* wip

* fix comment (paritytech#14316)

* fix test

* fix

* Update frame/contracts/src/migration.rs

Co-authored-by: Juan <juangirini@gmail.com>

* fix test doc

* Apply suggestions from code review

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Fix compilation with feature runtime-benchmarks

* fix example

* fix  cargo doc --document-private-items

* private links

* Remove dup comment

* add doc for MigrationInProgress

* PR review remove duplicate asserts

* simplify upper bound

* fix link

* typo

* typo

* no unwrap()

* correct log message

* missing

* fix typo

* PR comment

* Add example with single element tuple

* Improve migration message

* Update frame/contracts/src/benchmarking/mod.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Update frame/contracts/src/migration.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Update frame/contracts/src/migration.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* use saturating_accrue instead of +=

* add more doc

* Contracts: Better migration types (paritytech#14418)

* Add explicit error, if try-runtime runs a noop migration

* use mut remaining_weight

---------

Co-authored-by: Juan Girini <juangirini@gmail.com>
Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@juangirini juangirini juangirini approved these changes

@ggwpez ggwpez ggwpez approved these changes

@athei athei Awaiting requested review from athei

@agryaznov agryaznov Awaiting requested review from agryaznov

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pgherveou @agryaznov @juangirini @ggwpez