Skip to content

Commit a607103

Browse files
v9nv9n
committed
code review
1 parent b19875f commit a607103

File tree

3 files changed

+21
-62
lines changed

3 files changed

+21
-62
lines changed

‎pallets/automation-time/src/migrations/update_task_idv2.rs

Lines changed: 12 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@ use xcm::{latest::prelude::*, VersionedMultiLocation};
2121

2222
use crate::migrations::utils::{
2323
deprecate::{generate_old_task_id, old_taskid_to_idv2},
24-
OldAccountTaskId, OldMissedTaskV2Of, OldScheduledTasksOf,
24+
OldAccountTaskId, OldMissedTaskV2Of, OldScheduledTasksOf, TEST_TASKID1, TEST_TASKID2,
2525
};
2626

27-
// These are H256/BlakeTwo256 hex generate from our old task id generation from hashing
28-
// These cons are used for our unit test
29-
// (Account, ProvidedID)
30-
const TEST_TASKID1: &str = "0xd1263842e34adeb00be1146b30bc6527951f0a0f5d5a3f7a758537735b8bcb04";
31-
const TEST_TASKID2: &str = "0xf76acf0b1d8ef503450a4d5c1a451f1921a906e8711f551c2945e09fb44de5ff";
32-
3327
// This is old TaskQueueV2 with old Task
3428
#[frame_support::storage_alias]
3529
pub type TaskQueueV2<T: Config> =
@@ -256,22 +250,8 @@ mod test {
256250
let task_owner2 = AccountId32::new(BOB);
257251

258252
// These are H256/BlakeTwo256 hex generate from our old task id generation from hashing
259-
// (Account, ProvidedID)
260-
// 0xd1263842e34adeb00be1146b30bc6527951f0a0f5d5a3f7a758537735b8bcb04
261-
let task_id1: Vec<u8> = vec![
262-
48, 120, 100, 49, 50, 54, 51, 56, 52, 50, 101, 51, 52, 97, 100, 101, 98, 48, 48,
263-
98, 101, 49, 49, 52, 54, 98, 51, 48, 98, 99, 54, 53, 50, 55, 57, 53, 49, 102, 48,
264-
97, 48, 102, 53, 100, 53, 97, 51, 102, 55, 97, 55, 53, 56, 53, 51, 55, 55, 51, 53,
265-
98, 56, 98, 99, 98, 48, 52,
266-
];
267-
// 0xf76acf0b1d8ef503450a4d5c1a451f1921a906e8711f551c2945e09fb44de5ff
268-
// (account_id2, 2) ->
269-
let task_id2: Vec<u8> = vec![
270-
48, 120, 102, 55, 54, 97, 99, 102, 48, 98, 49, 100, 56, 101, 102, 53, 48, 51, 52,
271-
53, 48, 97, 52, 100, 53, 99, 49, 97, 52, 53, 49, 102, 49, 57, 50, 49, 97, 57, 48,
272-
54, 101, 56, 55, 49, 49, 102, 53, 53, 49, 99, 50, 57, 52, 53, 101, 48, 57, 102, 98,
273-
52, 52, 100, 101, 53, 102, 102,
274-
];
253+
let task_id1: Vec<u8> = TEST_TASKID1.as_bytes().to_vec();
254+
let task_id2: Vec<u8> = TEST_TASKID2.as_bytes().to_vec();
275255

276256
super::ScheduledTasksV3::<Test>::insert(
277257
3600,
@@ -338,22 +318,16 @@ mod test {
338318
// (task owner, vec![33]) hash -> "0x7191f3d83bcbeb221f7b00f501e9a8da3ba3c2d15a672eb694ee7e09dbaddd1e"
339319
(
340320
task_owner2.clone(),
341-
vec![
342-
48, 120, 55, 49, 57, 49, 102, 51, 100, 56, 51, 98, 99, 98, 101, 98, 50,
343-
50, 49, 102, 55, 98, 48, 48, 102, 53, 48, 49, 101, 57, 97, 56, 100, 97,
344-
51, 98, 97, 51, 99, 50, 100, 49, 53, 97, 54, 55, 50, 101, 98, 54, 57,
345-
52, 101, 101, 55, 101, 48, 57, 100, 98, 97, 100, 100, 100, 49, 101
346-
]
321+
"0x7191f3d83bcbeb221f7b00f501e9a8da3ba3c2d15a672eb694ee7e09dbaddd1e"
322+
.as_bytes()
323+
.to_vec(),
347324
),
348-
// (task owner1, vec![32]) hash -> "0x7191f3d83bcbeb221f7b00f501e9a8da3ba3c2d15a672eb694ee7e09dbaddd1e"
325+
// (task owner1, vec![32]) hash -> "0xe94040ca5d09f0e1023aecf5abc3afac0b9e66bc3b1209183b3a009f4c073c2b"
349326
(
350327
task_owner1.clone(),
351-
vec![
352-
48, 120, 101, 57, 52, 48, 52, 48, 99, 97, 53, 100, 48, 57, 102, 48,
353-
101, 49, 48, 50, 51, 97, 101, 99, 102, 53, 97, 98, 99, 51, 97, 102, 97,
354-
99, 48, 98, 57, 101, 54, 54, 98, 99, 51, 98, 49, 50, 48, 57, 49, 56,
355-
51, 98, 51, 97, 48, 48, 57, 102, 52, 99, 48, 55, 51, 99, 50, 98
356-
]
328+
"0xe94040ca5d09f0e1023aecf5abc3afac0b9e66bc3b1209183b3a009f4c073c2b"
329+
.as_bytes()
330+
.to_vec(),
357331
),
358332
],
359333
"migration failed to convert old ScheduledTasksV3 to new TaskID format"
@@ -368,23 +342,8 @@ mod test {
368342
let account_id2 = AccountId32::new(BOB);
369343

370344
// These are H256/BlakeTwo256 hex generate from our old task id generation from hashing
371-
// (Account, ProvidedID)
372-
// (account_id1, 1) ->
373-
// 0xd1263842e34adeb00be1146b30bc6527951f0a0f5d5a3f7a758537735b8bcb04
374-
let task_id1: Vec<u8> = vec![
375-
48, 120, 100, 49, 50, 54, 51, 56, 52, 50, 101, 51, 52, 97, 100, 101, 98, 48, 48,
376-
98, 101, 49, 49, 52, 54, 98, 51, 48, 98, 99, 54, 53, 50, 55, 57, 53, 49, 102, 48,
377-
97, 48, 102, 53, 100, 53, 97, 51, 102, 55, 97, 55, 53, 56, 53, 51, 55, 55, 51, 53,
378-
98, 56, 98, 99, 98, 48, 52,
379-
];
380-
// 0xf76acf0b1d8ef503450a4d5c1a451f1921a906e8711f551c2945e09fb44de5ff
381-
// (account_id2, 2) ->
382-
let task_id2: Vec<u8> = vec![
383-
48, 120, 102, 55, 54, 97, 99, 102, 48, 98, 49, 100, 56, 101, 102, 53, 48, 51, 52,
384-
53, 48, 97, 52, 100, 53, 99, 49, 97, 52, 53, 49, 102, 49, 57, 50, 49, 97, 57, 48,
385-
54, 101, 56, 55, 49, 49, 102, 53, 53, 49, 99, 50, 57, 52, 53, 101, 48, 57, 102, 98,
386-
52, 52, 100, 101, 53, 102, 102,
387-
];
345+
let task_id1: Vec<u8> = TEST_TASKID1.as_bytes().to_vec();
346+
let task_id2: Vec<u8> = TEST_TASKID2.as_bytes().to_vec();
388347

389348
let old_missed_queueu_v2 = vec![
390349
OldMissedTaskV2 {

‎pallets/automation-time/src/migrations/update_xcmp_task.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use xcm::{latest::prelude::*, VersionedMultiLocation};
1414

1515
use crate::migrations::utils::{
1616
deprecate::{generate_old_task_id, old_taskid_to_idv2},
17-
OldAccountTaskId, OldAction, OldTask, OldTaskId,
17+
OldAccountTaskId, OldAction, OldTask, OldTaskId, TEST_TASKID1,
1818
};
1919

2020
const EXECUTION_FEE_AMOUNT: u128 = 3_000_000_000;
@@ -116,7 +116,7 @@ impl<T: Config> OnRuntimeUpgrade for UpdateXcmpTask<T> {
116116
mod test {
117117
use super::{
118118
generate_old_task_id, OldAction, OldTask, ParaId, UpdateXcmpTask, EXECUTION_FEE_AMOUNT,
119-
INSTRUCTION_WEIGHT_REF_TIME,
119+
INSTRUCTION_WEIGHT_REF_TIME, TEST_TASKID1,
120120
};
121121
use crate::{mock::*, ActionOf, AssetPayment, InstructionSequence, Pallet, Schedule, TaskOf};
122122
use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
@@ -156,13 +156,7 @@ mod test {
156156

157157
assert_eq!(crate::AccountTasks::<Test>::iter().count(), 1);
158158

159-
// 0xd1263842e34adeb00be1146b30bc6527951f0a0f5d5a3f7a758537735b8bcb04
160-
let task_id1 = vec![
161-
48, 120, 100, 49, 50, 54, 51, 56, 52, 50, 101, 51, 52, 97, 100, 101, 98, 48, 48,
162-
98, 101, 49, 49, 52, 54, 98, 51, 48, 98, 99, 54, 53, 50, 55, 57, 53, 49, 102, 48,
163-
97, 48, 102, 53, 100, 53, 97, 51, 102, 55, 97, 55, 53, 56, 53, 51, 55, 55, 51, 53,
164-
98, 56, 98, 99, 98, 48, 52,
165-
];
159+
let task_id1 = TEST_TASKID1.as_bytes().to_vec();
166160
assert_eq!(
167161
crate::AccountTasks::<Test>::get(account_id.clone(), task_id1.clone()).unwrap(),
168162
TaskOf::<Test> {

‎pallets/automation-time/src/migrations/utils.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ use sp_runtime::traits::Convert;
1818
use sp_std::{vec, vec::Vec};
1919
use xcm::{latest::prelude::*, VersionedMultiLocation};
2020

21+
// These are H256/BlakeTwo256 hex generate from our old task id generation from hashing
22+
// These cons are used for our unit test
23+
// (Account, ProvidedID)
24+
pub const TEST_TASKID1: &str = "0xd1263842e34adeb00be1146b30bc6527951f0a0f5d5a3f7a758537735b8bcb04";
25+
pub const TEST_TASKID2: &str = "0xf76acf0b1d8ef503450a4d5c1a451f1921a906e8711f551c2945e09fb44de5ff";
26+
2127
// Old format
2228
pub type OldTaskId<T> = <T as frame_system::Config>::Hash;
2329
pub type OldAccountTaskId<T> = (AccountOf<T>, OldTaskId<T>);

0 commit comments

Comments
 (0)