mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-29 16:07:57 +00:00
Enrich metadata with type information (#8615)
* Cargo.lock after merge * Restore scale-info feature * Fully qualify TypeInfo derive * Skip PendingSwap T * Add missing skip_type_params attr * metadata docs features * Reduce pallet event attribute to struct * Cargo.lock * Update frame/balances/src/tests_composite.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Line widths check * Cargo.lock * Add scale-info/std * Update frame/system/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Use `skip_type_params` to remove `TypeInfo` requirements on checks * Revert "Remove unused Call metadata stuff" This reverts commit 41311f85 * Skip BalanceSwapAction type parameter * Remove unused event metadata macro * Update frame-metadata * Update primitives/npos-elections/compact/src/codec.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Manual TypeInfo for Header * Remove TypeInfo requirement for consts in BoundedVec etc. * Another TypeInfo bound removed * review: fix indentation * TypeInfo impls for Identity types * Add some todos to add custom TypeInfo impls * Update frame/support/procedural/src/pallet/expand/pallet_struct.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Add some todos to add custom TypeInfo impls * Add a test for manual Data TypeInfo impl * Add custom TypeInfo impl for Vote * Era custom TypeInfo crimes * Revert finality-grandpa version to 0.14.z * review: renamed module to pallet_constants_metadata * New line at end of file * Add missing scale-info/std * Update frame/support/src/storage/types/mod.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Remove StorageEntryType::Map unused flag * Add missing scale-info dependency after merge * SignedExtension::AdditionalSigned metadata * Update frame-metadata, use abbreviated docs and args fields * Update frame/example/Cargo.toml Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Add scale_info/std and remove unused scale-info dependency * Remove scale-info dependency * Remove treasury pallet::metadata * Remove redundant Event test * Add back scale-info as dev dependency * fix error metadata when no error defined in decl_module * Add Module3 to tests * Fix metadata test * Add docs feature to frame-support test * WIP fixing pallet metadata test * Remove redundant FunctionMetadata, FunctionArgumentMetadata as per https://github.com/paritytech/frame-metadata/pull/20 * Use main branch of frame-metadata * Use patch of scale-info for latest changes * Use latest patched scale-info * Manual TypeInfo for DigestItem * Manual TypeInfo for DigestItem * Update scale-info * Skip __Ignore variants for Error, depends on https://github.com/paritytech/scale-info/pull/117 * Named fields for FRAME v2 pallet Call variants * Named fields for FRAME v1 pallet Call variants * Add missing scale-info dependency * WIP expand benchmark call variant * fix benchmark with new function create a new function for each variant of a pallet call. This function is called by benchmarking macro in order not to break call creation with unnamed argument * fix tests * more fix * Fix staking tests * Fix offchain workers calls * Cherry pick rustfmt.toml from master * cargo +nightly-2021-06-22 fmt --all * Update to new call variant structs * More call variant struct updates * Remove unused import * More call variant structs * More call variant structs * Even more call variant structs * Mooar variant structs * Evermore variant structs * Call variant structs ad infinitum * Fmt * More call variants * Last call variant * Call variants all done? * Fix SS58Prefix type * Potential workaround for BitFlags<IdentityFields> TypeInfo * Enable docs capturing for Call, Event, and Error types * Fix IdentityFields TypeInfo * Remove metadata-docs feature * Add capture_docs = true for legacy Call, Event and Error types * Fmt * Fix metadata test type * Update benchmarks with call struct variants * Fmt * More test fixes * Fmt * Fix benches * Use latest capture_docs attr * Latest scale_info * Fmt * review: change &Vec to &[] * Remove pallet metadata attr * review: remove commented out test code * review: skip_type_params trailing comma suggestion * Update to scale-info 0.10.0 * Update construct_runtime ui tests, different because of metadata TypeInfo impls * Add some TypeInfo derives for UI tests * Update storage ensure span ui stderrs * Update call argument bound ui tests Possibly changed because change from tuple to struct variants? * Add scale-info dev dependency * Update to latest finality-grandpa release * review: missing newline * review: missing scale-info/std * review: remove duplicate scale-info/std * review: remove fully qualified TypeInfo * review: add missing scale-info/std * review: remove unnecessary imports. * Fmt * Use crates.io RC version of frame-metadata * Remove scale-info/std because it is a dev dependency * Add missing scale_info dev-dependency for test * Delete empty metadata folder * Fix sp_std import * review: improve manual UncheckedExtrinsic TypeInfo impl * review: use full scale-info for dev-dependency * Remove DefaultByteGetter impl * review: derive TypeInfo for generic header * Fmt * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update bin/node/executor/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/identity/src/types.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/support/src/dispatch.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Remove redundant derive * Simplify scale-info dependency * Strip underscore prefix from call variant struct names * Another underscore field * More underscore fields * Another underscore field * Update to frame-metadata 14.0.0-rc.2 with combined StorageEntryType::Map * Fmt * Revert weights formatting * Fix up some tests * Fix up some tests for StorageEntryTypeMetadata * scale-info dev dependency * Fix test error * Add missing TypeInfo derives * Add back missing scale-info dependency * Add back missing scale-info dependency * Fix npos compact impls * Cargo.lock * Fmt * Fix errors * Fmt * Fix renamed raw_solution field * Fix error * Fmt * Fix some benchmarks * Fmt * Stray R * Fix * Add missing TypeInfos * ui test fix * Fix line widths * Revert "ui test fix" This reverts commit 2d15ec058a216e3f92d713f1174603a2bb1eac65. * Upgrade to scale-info 0.11.0 * Revert "Upgrade to scale-info 0.11.0" This reverts commit 047bb179085a0059c36cd20ab405f55cf0867e28. * Add Runtime type * Update to scale-info 0.12 * Update to scale-info 1.0 * Update frame-metadata to version 14.0.0 * Patch finality-grandpa until release available * Fix metadata tests * Fix metadata tests * Fmt * Remove patched finality-grandpa * Fix tests, use scale_info imports * Fix pallet tests * Add BlockNumber TypeInfo bound * ui test fix * Cargo.lock * Remove pallet metadata * Cargo.lock * Add missing scale-info dependency * Remove pallet event metadata * Fix error * Fix collective errors * Semicolol * Fmt * Remove another metadata attribute * Add new variant to custom digest TypeInfo * Fmt * Cargo.lock from master * Remove comma lol * Fix example call error * Fix example call error properly Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
@@ -35,11 +35,11 @@ fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
|
||||
let delay = 5u32.into();
|
||||
// Calls will be maximum length...
|
||||
let mut calls = vec![
|
||||
frame_system::Call::<T>::set_code(vec![]).into();
|
||||
frame_system::Call::<T>::set_code { code: vec![] }.into();
|
||||
T::MaxCalls::get().saturating_sub(1) as usize
|
||||
];
|
||||
// Last call will be the match for worst case scenario.
|
||||
calls.push(frame_system::Call::<T>::remark(vec![]).into());
|
||||
calls.push(frame_system::Call::<T>::remark { remark: vec![] }.into());
|
||||
let origin = T::ManagerOrigin::successful_origin();
|
||||
Lottery::<T>::set_calls(origin.clone(), calls)?;
|
||||
Lottery::<T>::start_lottery(origin, price, length, delay, repeat)?;
|
||||
@@ -53,7 +53,7 @@ benchmarks! {
|
||||
setup_lottery::<T>(false)?;
|
||||
// force user to have a long vec of calls participating
|
||||
let set_code_index: CallIndex = Lottery::<T>::call_to_index(
|
||||
&frame_system::Call::<T>::set_code(vec![]).into()
|
||||
&frame_system::Call::<T>::set_code{ code: vec![] }.into()
|
||||
)?;
|
||||
let already_called: (u32, Vec<CallIndex>) = (
|
||||
LotteryIndex::<T>::get(),
|
||||
@@ -64,7 +64,7 @@ benchmarks! {
|
||||
);
|
||||
Participants::<T>::insert(&caller, already_called);
|
||||
|
||||
let call = frame_system::Call::<T>::remark(vec![]);
|
||||
let call = frame_system::Call::<T>::remark { remark: vec![] };
|
||||
}: _(RawOrigin::Signed(caller), Box::new(call.into()))
|
||||
verify {
|
||||
assert_eq!(TicketsCount::<T>::get(), 1);
|
||||
@@ -72,9 +72,9 @@ benchmarks! {
|
||||
|
||||
set_calls {
|
||||
let n in 0 .. T::MaxCalls::get() as u32;
|
||||
let calls = vec![frame_system::Call::<T>::remark(vec![]).into(); n as usize];
|
||||
let calls = vec![frame_system::Call::<T>::remark { remark: vec![] }.into(); n as usize];
|
||||
|
||||
let call = Call::<T>::set_calls(calls);
|
||||
let call = Call::<T>::set_calls { calls };
|
||||
let origin = T::ManagerOrigin::successful_origin();
|
||||
assert!(CallIndices::<T>::get().is_empty());
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
@@ -89,7 +89,7 @@ benchmarks! {
|
||||
let end = 10u32.into();
|
||||
let payout = 5u32.into();
|
||||
|
||||
let call = Call::<T>::start_lottery(price, end, payout, true);
|
||||
let call = Call::<T>::start_lottery { price, length: end, delay: payout, repeat: true };
|
||||
let origin = T::ManagerOrigin::successful_origin();
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
@@ -99,7 +99,7 @@ benchmarks! {
|
||||
stop_repeat {
|
||||
setup_lottery::<T>(true)?;
|
||||
assert_eq!(crate::Lottery::<T>::get().unwrap().repeat, true);
|
||||
let call = Call::<T>::stop_repeat();
|
||||
let call = Call::<T>::stop_repeat {};
|
||||
let origin = T::ManagerOrigin::successful_origin();
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
@@ -115,7 +115,7 @@ benchmarks! {
|
||||
let lottery_account = Lottery::<T>::account_id();
|
||||
T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
|
||||
// Buy a ticket
|
||||
let call = frame_system::Call::<T>::remark(vec![]);
|
||||
let call = frame_system::Call::<T>::remark { remark: vec![] };
|
||||
Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
|
||||
// Kill user account for worst case
|
||||
T::Currency::make_free_balance_be(&winner, 0u32.into());
|
||||
@@ -146,7 +146,7 @@ benchmarks! {
|
||||
let lottery_account = Lottery::<T>::account_id();
|
||||
T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
|
||||
// Buy a ticket
|
||||
let call = frame_system::Call::<T>::remark(vec![]);
|
||||
let call = frame_system::Call::<T>::remark { remark: vec![] };
|
||||
Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
|
||||
// Kill user account for worst case
|
||||
T::Currency::make_free_balance_be(&winner, 0u32.into());
|
||||
|
||||
@@ -76,7 +76,7 @@ type BalanceOf<T> =
|
||||
// We use this to uniquely match someone's incoming call with the calls configured for the lottery.
|
||||
type CallIndex = (u8, u8);
|
||||
|
||||
#[derive(Encode, Decode, Default, Eq, PartialEq, RuntimeDebug)]
|
||||
#[derive(Encode, Decode, Default, Eq, PartialEq, RuntimeDebug, scale_info::TypeInfo)]
|
||||
pub struct LotteryConfig<BlockNumber, Balance> {
|
||||
/// Price per entry.
|
||||
price: Balance,
|
||||
@@ -170,7 +170,6 @@ pub mod pallet {
|
||||
|
||||
#[pallet::event]
|
||||
#[pallet::generate_deposit(pub(super) fn deposit_event)]
|
||||
#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
|
||||
pub enum Event<T: Config> {
|
||||
/// A lottery has been started!
|
||||
LotteryStarted,
|
||||
|
||||
@@ -43,8 +43,8 @@ fn basic_end_to_end_works() {
|
||||
let length = 20;
|
||||
let delay = 5;
|
||||
let calls = vec![
|
||||
Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
|
||||
Call::Balances(BalancesCall::transfer(0, 0)),
|
||||
Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
|
||||
Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
|
||||
];
|
||||
|
||||
// Set calls for the lottery
|
||||
@@ -55,7 +55,7 @@ fn basic_end_to_end_works() {
|
||||
assert!(crate::Lottery::<Test>::get().is_some());
|
||||
|
||||
assert_eq!(Balances::free_balance(&1), 100);
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 20 }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
|
||||
// 20 from the transfer, 10 from buying a ticket
|
||||
assert_eq!(Balances::free_balance(&1), 100 - 20 - 10);
|
||||
@@ -96,17 +96,17 @@ fn set_calls_works() {
|
||||
assert!(!CallIndices::<Test>::exists());
|
||||
|
||||
let calls = vec![
|
||||
Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
|
||||
Call::Balances(BalancesCall::transfer(0, 0)),
|
||||
Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
|
||||
Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
|
||||
];
|
||||
|
||||
assert_ok!(Lottery::set_calls(Origin::root(), calls));
|
||||
assert!(CallIndices::<Test>::exists());
|
||||
|
||||
let too_many_calls = vec![
|
||||
Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
|
||||
Call::Balances(BalancesCall::transfer(0, 0)),
|
||||
Call::System(SystemCall::remark(vec![])),
|
||||
Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
|
||||
Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
|
||||
Call::System(SystemCall::remark { remark: vec![] }),
|
||||
];
|
||||
|
||||
assert_noop!(
|
||||
@@ -150,7 +150,7 @@ fn buy_ticket_works_as_simple_passthrough() {
|
||||
// as a simple passthrough to the real call.
|
||||
new_test_ext().execute_with(|| {
|
||||
// No lottery set up
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 20 }));
|
||||
// This is just a basic transfer then
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
|
||||
assert_eq!(Balances::free_balance(&1), 100 - 20);
|
||||
@@ -158,8 +158,8 @@ fn buy_ticket_works_as_simple_passthrough() {
|
||||
|
||||
// Lottery is set up, but too expensive to enter, so `do_buy_ticket` fails.
|
||||
let calls = vec![
|
||||
Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
|
||||
Call::Balances(BalancesCall::transfer(0, 0)),
|
||||
Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
|
||||
Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
|
||||
];
|
||||
assert_ok!(Lottery::set_calls(Origin::root(), calls));
|
||||
|
||||
@@ -170,21 +170,24 @@ fn buy_ticket_works_as_simple_passthrough() {
|
||||
assert_eq!(TicketsCount::<Test>::get(), 0);
|
||||
|
||||
// If call would fail, the whole thing still fails the same
|
||||
let fail_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1000)));
|
||||
let fail_call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1000 }));
|
||||
assert_noop!(
|
||||
Lottery::buy_ticket(Origin::signed(1), fail_call),
|
||||
BalancesError::<Test, _>::InsufficientBalance,
|
||||
);
|
||||
|
||||
let bad_origin_call = Box::new(Call::Balances(BalancesCall::force_transfer(0, 0, 0)));
|
||||
assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin);
|
||||
let bad_origin_call =
|
||||
Box::new(Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }));
|
||||
assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin,);
|
||||
|
||||
// User can call other txs, but doesn't get a ticket
|
||||
let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
|
||||
let remark_call =
|
||||
Box::new(Call::System(SystemCall::remark { remark: b"hello, world!".to_vec() }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(2), remark_call));
|
||||
assert_eq!(TicketsCount::<Test>::get(), 0);
|
||||
|
||||
let successful_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
|
||||
let successful_call =
|
||||
Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1 }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(2), successful_call));
|
||||
assert_eq!(TicketsCount::<Test>::get(), 1);
|
||||
});
|
||||
@@ -195,13 +198,13 @@ fn buy_ticket_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
// Set calls for the lottery.
|
||||
let calls = vec![
|
||||
Call::System(SystemCall::remark(vec![])),
|
||||
Call::Balances(BalancesCall::transfer(0, 0)),
|
||||
Call::System(SystemCall::remark { remark: vec![] }),
|
||||
Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
|
||||
];
|
||||
assert_ok!(Lottery::set_calls(Origin::root(), calls));
|
||||
|
||||
// Can't buy ticket before start
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1 }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
|
||||
assert_eq!(TicketsCount::<Test>::get(), 0);
|
||||
|
||||
@@ -214,12 +217,12 @@ fn buy_ticket_works() {
|
||||
assert_eq!(TicketsCount::<Test>::get(), 1);
|
||||
|
||||
// Can't buy another of the same ticket (even if call is slightly changed)
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(3, 30)));
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 3, value: 30 }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
|
||||
assert_eq!(TicketsCount::<Test>::get(), 1);
|
||||
|
||||
// Buy ticket for remark
|
||||
let call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
|
||||
let call = Box::new(Call::System(SystemCall::remark { remark: b"hello, world!".to_vec() }));
|
||||
assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
|
||||
assert_eq!(TicketsCount::<Test>::get(), 2);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user