Skip to content

Commit abc3603

Browse files
open-juniusopen-junius
committed
rename the storage
1 parent c86de44 commit abc3603

File tree

11 files changed

+30
-33
lines changed

11 files changed

+30
-33
lines changed

‎pallets/subtensor/src/benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ benchmark_start_call {
681681

682682
assert_ok!(Subtensor::<T>::do_burned_registration(RawOrigin::Signed(coldkey.clone()).into(), netuid, hotkey.clone()));
683683
assert_eq!(SubnetOwner::<T>::get(netuid), coldkey.clone());
684-
assert_eq!(LastEmissionBlockNumber::<T>::get(netuid), None);
684+
assert_eq!(FirstEmissionBlockNumber::<T>::get(netuid), None);
685685
let current_block: u64 = Subtensor::<T>::get_current_block_as_u64();
686686
let duration = <T as Config>::DurationOfStartCall::get();
687687
let block: BlockNumberFor<T> = (current_block + duration).try_into().ok().expect("");

‎pallets/subtensor/src/coinbase/run_coinbase.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<T: Config> Pallet<T> {
4141
let subnets: Vec<u16> = Self::get_all_subnet_netuids()
4242
.into_iter()
4343
.filter(|netuid| *netuid != 0)
44-
.filter(|netuid| LastEmissionBlockNumber::<T>::get(*netuid).is_some())
44+
.filter(|netuid| FirstEmissionBlockNumber::<T>::get(*netuid).is_some())
4545
.collect();
4646
log::debug!("All subnet netuids: {:?}", subnets);
4747

@@ -245,9 +245,6 @@ impl<T: Config> Pallet<T> {
245245
pending_swapped,
246246
owner_cut,
247247
);
248-
249-
// Set last emission block
250-
LastEmissionBlockNumber::<T>::insert(netuid, Self::get_current_block_as_u64())
251248
} else {
252249
// Increment
253250
BlocksSinceLastStep::<T>::mutate(netuid, |total| *total = total.saturating_add(1));

‎pallets/subtensor/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ pub mod pallet {
11271127
/// ============================
11281128
/// --- MAP ( netuid ) --> block number of last emission
11291129
#[pallet::storage]
1130-
pub type LastEmissionBlockNumber<T: Config> = StorageMap<_, Identity, u16, u64, OptionQuery>;
1130+
pub type FirstEmissionBlockNumber<T: Config> = StorageMap<_, Identity, u16, u64, OptionQuery>;
11311131
/// --- MAP ( netuid ) --> subnet mechanism
11321132
#[pallet::storage]
11331133
pub type SubnetMechanism<T: Config> =

‎pallets/subtensor/src/macros/dispatches.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ mod dispatches {
19201920
/// Emits a `CallInitiated` event on success.
19211921
#[pallet::call_index(92)]
19221922
#[pallet::weight((
1923-
Weight::from_parts(3_000_000, 0).saturating_add(T::DbWeight::get().reads_writes(3, 3)),
1923+
Weight::from_parts(3_000_000, 0).saturating_add(T::DbWeight::get().reads_writes(6, 1)),
19241924
DispatchClass::Operational,
19251925
Pays::Yes
19261926
))]

‎pallets/subtensor/src/macros/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ mod errors {
195195
ActivityCutoffTooLow,
196196
/// Call is disabled
197197
CallDisabled,
198-
/// LastEmissionBlockNumber is already set.
199-
LastEmissionBlockNumberAlreadySet,
198+
/// FirstEmissionBlockNumber is already set.
199+
FirstEmissionBlockNumberAlreadySet,
200200
/// need wait for more blocks to accept the start call extrinsic.
201201
NeedWaitingMoreBlocksToStarCall,
202202
/// Not enough AlphaOut on the subnet to recycle

‎pallets/subtensor/src/macros/events.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,12 @@ mod events {
275275
/// Parameters:
276276
/// (netuid, new_hotkey)
277277
SubnetOwnerHotkeySet(u16, T::AccountId),
278-
/// LastEmissionBlockNumber is set via start call extrinsic
278+
/// FirstEmissionBlockNumber is set via start call extrinsic
279279
///
280280
/// Parameters:
281281
/// netuid
282282
/// block number
283-
LastEmissionBlockNumberSet(u16, u64),
283+
FirstEmissionBlockNumberSet(u16, u64),
284284

285285
/// Alpha has been recycled, reducing AlphaOut on a subnet.
286286
///

‎pallets/subtensor/src/migrations/migrate_set_last_emission_block_number.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub fn migrate_set_last_emission_block_number<T: Config>() -> Weight {
2727
let current_block_number = Pallet::<T>::get_current_block_as_u64();
2828
for netuid in netuids.iter() {
2929
if *netuid != 0 {
30-
LastEmissionBlockNumber::<T>::insert(netuid, current_block_number);
30+
FirstEmissionBlockNumber::<T>::insert(netuid, current_block_number);
3131
}
3232
}
3333

‎pallets/subtensor/src/subnets/subnet.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl<T: Config> Pallet<T> {
337337
///
338338
/// * `Error::<T>::SubNetworkDoesNotExist`: If the subnet does not exist.
339339
/// * `DispatchError::BadOrigin`: If the caller is not the subnet owner.
340-
/// * `Error::<T>::LastEmissionBlockNumberAlreadySet`: If the last emission block number has already been set.
340+
/// * `Error::<T>::FirstEmissionBlockNumberAlreadySet`: If the last emission block number has already been set.
341341
///
342342
/// # Returns
343343
///
@@ -349,8 +349,8 @@ impl<T: Config> Pallet<T> {
349349
);
350350
Self::ensure_subnet_owner(origin, netuid)?;
351351
ensure!(
352-
LastEmissionBlockNumber::<T>::get(netuid).is_none(),
353-
Error::<T>::LastEmissionBlockNumberAlreadySet
352+
FirstEmissionBlockNumber::<T>::get(netuid).is_none(),
353+
Error::<T>::FirstEmissionBlockNumberAlreadySet
354354
);
355355

356356
let registration_block_number = NetworkRegisteredAt::<T>::get(netuid);
@@ -362,15 +362,15 @@ impl<T: Config> Pallet<T> {
362362
Error::<T>::NeedWaitingMoreBlocksToStarCall
363363
);
364364

365-
LastEmissionBlockNumber::<T>::insert(netuid, current_block_number);
366-
Self::deposit_event(Event::LastEmissionBlockNumberSet(
365+
FirstEmissionBlockNumber::<T>::insert(netuid, current_block_number + 1);
366+
Self::deposit_event(Event::FirstEmissionBlockNumberSet(
367367
netuid,
368-
current_block_number,
368+
current_block_number + 1,
369369
));
370370
Ok(())
371371
}
372372

373373
pub fn is_valid_subnet_for_emission(netuid: u16) -> bool {
374-
LastEmissionBlockNumber::<T>::get(netuid).is_some()
374+
FirstEmissionBlockNumber::<T>::get(netuid).is_some()
375375
}
376376
}

‎pallets/subtensor/src/tests/migration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ fn test_migrate_set_last_emission_block_number() {
432432
let expected_weight: Weight = <Test as Config>::DbWeight::get().reads(3) + <Test as Config>::DbWeight::get().writes(netuids.len() as u64);
433433
assert_eq!(weight, expected_weight);
434434

435-
assert_eq!(LastEmissionBlockNumber::<Test>::get(0), None);
435+
assert_eq!(FirstEmissionBlockNumber::<Test>::get(0), None);
436436
for netuid in netuids.iter() {
437-
assert_eq!(LastEmissionBlockNumber::<Test>::get(netuid), Some(block_number));
437+
assert_eq!(FirstEmissionBlockNumber::<Test>::get(netuid), Some(block_number));
438438
}
439439
});
440440
}

‎pallets/subtensor/src/tests/mock.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ pub fn add_network(netuid: u16, tempo: u16, _modality: u16) {
664664
SubtensorModule::init_new_network(netuid, tempo);
665665
SubtensorModule::set_network_registration_allowed(netuid, true);
666666
SubtensorModule::set_network_pow_registration_allowed(netuid, true);
667-
LastEmissionBlockNumber::<Test>::insert(netuid, 0);
667+
FirstEmissionBlockNumber::<Test>::insert(netuid, 0);
668668
}
669669

670670
#[allow(dead_code)]
@@ -686,7 +686,7 @@ pub fn add_dynamic_network(hotkey: &U256, coldkey: &U256) -> u16 {
686686
));
687687
NetworkRegistrationAllowed::<Test>::insert(netuid, true);
688688
NetworkPowRegistrationAllowed::<Test>::insert(netuid, true);
689-
LastEmissionBlockNumber::<Test>::insert(netuid, 0);
689+
FirstEmissionBlockNumber::<Test>::insert(netuid, 0);
690690
netuid
691691
}
692692

‎pallets/subtensor/src/tests/subnet.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn test_do_start_call_ok() {
1919
//add network
2020
SubtensorModule::set_burn(netuid, burn_cost);
2121
add_network_without_emission_block(netuid, tempo, 0);
22-
assert_eq!(LastEmissionBlockNumber::<Test>::get(netuid), None);
22+
assert_eq!(FirstEmissionBlockNumber::<Test>::get(netuid), None);
2323

2424
// Give it some $$$ in his coldkey balance
2525
SubtensorModule::add_balance_to_coldkey_account(&coldkey_account_id, 10000);
@@ -42,8 +42,8 @@ fn test_do_start_call_ok() {
4242
));
4343

4444
assert_eq!(
45-
LastEmissionBlockNumber::<Test>::get(netuid),
46-
Some(block_number)
45+
FirstEmissionBlockNumber::<Test>::get(netuid),
46+
Some(block_number + 1)
4747
);
4848
});
4949
}
@@ -143,7 +143,7 @@ fn test_do_start_call_fail_for_set_again() {
143143
//add network
144144
SubtensorModule::set_burn(netuid, burn_cost);
145145
add_network_without_emission_block(netuid, tempo, 0);
146-
assert_eq!(LastEmissionBlockNumber::<Test>::get(netuid), None);
146+
assert_eq!(FirstEmissionBlockNumber::<Test>::get(netuid), None);
147147

148148
// Give it some $$$ in his coldkey balance
149149
SubtensorModule::add_balance_to_coldkey_account(&coldkey_account_id, 10000);
@@ -170,7 +170,7 @@ fn test_do_start_call_fail_for_set_again() {
170170
<<Test as Config>::RuntimeOrigin>::signed(coldkey_account_id),
171171
netuid
172172
),
173-
Error::<Test>::LastEmissionBlockNumberAlreadySet
173+
Error::<Test>::FirstEmissionBlockNumberAlreadySet
174174
);
175175
});
176176
}
@@ -186,7 +186,7 @@ fn test_do_start_call_ok_with_updated_block_number_after_coinbase() {
186186
//add network
187187
SubtensorModule::set_burn(netuid, burn_cost);
188188
add_network_without_emission_block(netuid, tempo, 0);
189-
assert_eq!(LastEmissionBlockNumber::<Test>::get(netuid), None);
189+
assert_eq!(FirstEmissionBlockNumber::<Test>::get(netuid), None);
190190

191191
// Give it some $$$ in his coldkey balance
192192
SubtensorModule::add_balance_to_coldkey_account(&coldkey_account_id, 10000);
@@ -209,14 +209,14 @@ fn test_do_start_call_ok_with_updated_block_number_after_coinbase() {
209209
));
210210

211211
assert_eq!(
212-
LastEmissionBlockNumber::<Test>::get(netuid),
213-
Some(block_number)
212+
FirstEmissionBlockNumber::<Test>::get(netuid),
213+
Some(block_number + 1)
214214
);
215215

216216
step_block(tempo);
217-
match LastEmissionBlockNumber::<Test>::get(netuid) {
217+
match FirstEmissionBlockNumber::<Test>::get(netuid) {
218218
Some(new_emission_block_number) => assert!(new_emission_block_number > block_number),
219-
None => assert!(LastEmissionBlockNumber::<Test>::get(netuid).is_some()),
219+
None => assert!(FirstEmissionBlockNumber::<Test>::get(netuid).is_some()),
220220
}
221221
});
222222
}

0 commit comments

Comments
 (0)