Skip to content

Ensure correct variant count in Runtime[Hold/Freeze]Reason #1900

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

Merged
merged 23 commits into from
Oct 24, 2023
Merged

Ensure correct variant count in Runtime[Hold/Freeze]Reason #1900

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
706d5ac
ensure correct variant count in Runtime[Hold/Freeze]Reason
kianenigma Oct 17, 2023
88a01c4
Fix balances mock
ggwpez Oct 17, 2023
7fa85df
Fix all other mocks
ggwpez Oct 17, 2023
3a58cf2
fmt
ggwpez Oct 17, 2023
2cd54be
set MaxHolds to 5 for kitchensink
ggwpez Oct 17, 2023
67c624e
fix
kianenigma Oct 18, 2023
50aa9e8
fix westend
kianenigma Oct 18, 2023
0e483d5
Fix more
ggwpez Oct 18, 2023
4c5d0a7
fix more runtimes
kianenigma Oct 18, 2023
ce34c6f
more
ggwpez Oct 18, 2023
23055ac
Merge branch 'kiz-variant-count' of github.com:paritytech/polkadot-sd…
kianenigma Oct 18, 2023
0ce8932
Merge remote-tracking branch 'origin/master' into kiz-variant-count
ggwpez Oct 18, 2023
ae3fc72
Fix more
ggwpez Oct 18, 2023
d5d0baf
Merge branch 'kiz-variant-count' of github.com:paritytech/polkadot-sd…
kianenigma Oct 18, 2023
96e0654
fux
kianenigma Oct 18, 2023
4efd3dc
Merge branch 'master' of github.com:paritytech/polkadot-sdk into kiz-…
kianenigma Oct 18, 2023
652733a
Extend error log
ggwpez Oct 18, 2023
26ce0cf
Increase MaxHolds on Rococo
ggwpez Oct 18, 2023
aecd5d0
Too much
ggwpez Oct 18, 2023
f0782f5
massive checkpoint
kianenigma Oct 22, 2023
35c304e
Merge branch 'kiz-variant-count' of github.com:paritytech/polkadot-sd…
kianenigma Oct 22, 2023
57adfb8
Merge branch 'master' into kiz-variant-count
kianenigma Oct 24, 2023
f24b7ff
Make VariantCount const
ggwpez Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix balances mock 
Signed-off-by: Oliver Tale-Yazdi <[email protected]>
  • Loading branch information
@ggwpez
ggwpez committed Oct 17, 2023
commit 88a01c4b27442e5266f8ebc883af7efa03f01bc4
10 changes: 9 additions & 1 deletion substrate/frame/balances/src/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

use crate::{self as pallet_balances, AccountData, Config, CreditOf, Error, Pallet};
use codec::{Decode, Encode, MaxEncodedLen};
use frame_support::traits::VariantCount;
use frame_support::{
assert_err, assert_noop, assert_ok, assert_storage_noop,
dispatch::{DispatchInfo, GetDispatchInfo},
Expand Down Expand Up @@ -70,6 +71,12 @@ pub enum TestId {
Baz,
}

impl VariantCount for TestId {
fn variant_count() -> u32 {
3
}
}

frame_support::construct_runtime!(
pub struct Test
{
Expand Down Expand Up @@ -132,9 +139,10 @@ impl Config for Test {
type ReserveIdentifier = TestId;
type WeightInfo = ();
type RuntimeHoldReason = TestId;
type RuntimeFreezeReason = RuntimeFreezeReason;
Copy link
Contributor

@franciscoaguirre franciscoaguirre Oct 18, 2023

Choose a reason for hiding this comment

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

Shouldn't this be TestId?

Copy link
Contributor Author

@kianenigma kianenigma Oct 18, 2023

Choose a reason for hiding this comment

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

probably me or oliver did too much copy pasta :D I will double check

Copy link
Contributor Author

@kianenigma kianenigma Oct 18, 2023

Choose a reason for hiding this comment

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

actually probably not, it should be the default one.

type FreezeIdentifier = TestId;
type MaxFreezes = ConstU32<2>;
type MaxHolds = ConstU32<2>;
type MaxHolds = ConstU32<3>;
}

#[derive(Clone)]
Expand Down