Skip to content

Commit 93831d8

Browse files
authored
fix: adjust code to get rid of calc_cu() returns 0 case #448 (#449)
1 parent 4d9f41d commit 93831d8

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

substrate-node/support/src/resources.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@ pub fn get_cu(resources: Resources) -> u64 {
1010
}
1111

1212
pub fn calc_cu(resources: Resources) -> u64 {
13-
let cru_min = resources.cru as u128 * 2 * GIB * ONE_THOUSAND;
14-
let mru_min = ((resources.mru as u128).checked_sub(1).unwrap_or(0) * GIB) * ONE_THOUSAND / 4;
15-
let sru_min = resources.sru as u128 * ONE_THOUSAND / 50;
16-
17-
if cru_min < mru_min && cru_min < sru_min {
18-
cru_min as u64
19-
} else if mru_min < cru_min && mru_min < sru_min {
20-
mru_min as u64
21-
} else if sru_min < cru_min && sru_min < mru_min {
22-
sru_min as u64
23-
} else {
24-
0
25-
}
13+
let cu_cru = resources.cru as u128 * 2 * GIB * ONE_THOUSAND;
14+
let cu_mru = ((resources.mru as u128).checked_sub(1).unwrap_or(0) * GIB) * ONE_THOUSAND / 4;
15+
let cu_sru = resources.sru as u128 * ONE_THOUSAND / 50;
16+
cu_cru.min(cu_mru.min(cu_sru)) as u64
2617
}
2718

2819
pub fn get_su(resources: Resources) -> u64 {

0 commit comments

Comments
 (0)