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

Commit 169b16f

Browse files
dvdplmgui1117
andauthored
Migrate assets pallet to new macros (#7984)
* Prep: move things around to suggested order * Compiles, tests pass * cleanup * cleanup 2 * Fix dead doc-links * Add back documentation for storage items * Switch benchmarks to use `Event` rather than `RawEvent`. * Update frame/assets/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * reviwe feedback * Obey line length checks Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
1 parent dc02c65 commit 169b16f

File tree

3 files changed

+375
-310
lines changed

3 files changed

+375
-310
lines changed

frame/assets/src/benchmarking.rs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use super::*;
2121
use sp_runtime::traits::Bounded;
2222
use frame_system::RawOrigin as SystemOrigin;
2323
use frame_benchmarking::{benchmarks, account, whitelisted_caller};
24+
use frame_support::traits::Get;
2425

2526
use crate::Module as Assets;
2627

@@ -79,15 +80,15 @@ benchmarks! {
7980
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
8081
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
8182
verify {
82-
assert_last_event::<T>(RawEvent::Created(Default::default(), caller.clone(), caller).into());
83+
assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
8384
}
8485

8586
force_create {
8687
let caller: T::AccountId = whitelisted_caller();
8788
let caller_lookup = T::Lookup::unlookup(caller.clone());
8889
}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
8990
verify {
90-
assert_last_event::<T>(RawEvent::ForceCreated(Default::default(), caller).into());
91+
assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
9192
}
9293

9394
destroy {
@@ -96,7 +97,7 @@ benchmarks! {
9697
add_zombies::<T>(caller.clone(), z);
9798
}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
9899
verify {
99-
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
100+
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
100101
}
101102

102103
force_destroy {
@@ -105,23 +106,23 @@ benchmarks! {
105106
add_zombies::<T>(caller.clone(), z);
106107
}: _(SystemOrigin::Root, Default::default(), 10_000)
107108
verify {
108-
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
109+
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
109110
}
110111

111112
mint {
112113
let (caller, caller_lookup) = create_default_asset::<T>(10);
113114
let amount = T::Balance::from(100u32);
114115
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
115116
verify {
116-
assert_last_event::<T>(RawEvent::Issued(Default::default(), caller, amount).into());
117+
assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
117118
}
118119

119120
burn {
120121
let amount = T::Balance::from(100u32);
121122
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
122123
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
123124
verify {
124-
assert_last_event::<T>(RawEvent::Burned(Default::default(), caller, amount).into());
125+
assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
125126
}
126127

127128
transfer {
@@ -131,7 +132,7 @@ benchmarks! {
131132
let target_lookup = T::Lookup::unlookup(target.clone());
132133
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
133134
verify {
134-
assert_last_event::<T>(RawEvent::Transferred(Default::default(), caller, target, amount).into());
135+
assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
135136
}
136137

137138
force_transfer {
@@ -141,14 +142,16 @@ benchmarks! {
141142
let target_lookup = T::Lookup::unlookup(target.clone());
142143
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
143144
verify {
144-
assert_last_event::<T>(RawEvent::ForceTransferred(Default::default(), caller, target, amount).into());
145+
assert_last_event::<T>(
146+
Event::ForceTransferred(Default::default(), caller, target, amount).into()
147+
);
145148
}
146149

147150
freeze {
148151
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
149152
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
150153
verify {
151-
assert_last_event::<T>(RawEvent::Frozen(Default::default(), caller).into());
154+
assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
152155
}
153156

154157
thaw {
@@ -160,14 +163,14 @@ benchmarks! {
160163
)?;
161164
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
162165
verify {
163-
assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
166+
assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
164167
}
165168

166169
freeze_asset {
167170
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
168171
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
169172
verify {
170-
assert_last_event::<T>(RawEvent::AssetFrozen(Default::default()).into());
173+
assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
171174
}
172175

173176
thaw_asset {
@@ -178,7 +181,7 @@ benchmarks! {
178181
)?;
179182
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
180183
verify {
181-
assert_last_event::<T>(RawEvent::AssetThawed(Default::default()).into());
184+
assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
182185
}
183186

184187
transfer_ownership {
@@ -187,7 +190,7 @@ benchmarks! {
187190
let target_lookup = T::Lookup::unlookup(target.clone());
188191
}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
189192
verify {
190-
assert_last_event::<T>(RawEvent::OwnerChanged(Default::default(), target).into());
193+
assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
191194
}
192195

193196
set_team {
@@ -197,7 +200,7 @@ benchmarks! {
197200
let target2 = T::Lookup::unlookup(account("target", 2, SEED));
198201
}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
199202
verify {
200-
assert_last_event::<T>(RawEvent::TeamChanged(
203+
assert_last_event::<T>(Event::TeamChanged(
201204
Default::default(),
202205
account("target", 0, SEED),
203206
account("target", 1, SEED),
@@ -211,7 +214,7 @@ benchmarks! {
211214
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
212215
}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
213216
verify {
214-
assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
217+
assert_last_event::<T>(Event::MaxZombiesChanged(Default::default(), max_zombies).into());
215218
}
216219

217220
set_metadata {
@@ -226,7 +229,7 @@ benchmarks! {
226229
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
227230
}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
228231
verify {
229-
assert_last_event::<T>(RawEvent::MetadataSet(Default::default(), name, symbol, decimals).into());
232+
assert_last_event::<T>(Event::MetadataSet(Default::default(), name, symbol, decimals).into());
230233
}
231234
}
232235

0 commit comments

Comments
 (0)