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

Commit bab9dec

Browse files
authored
Use MIN associated const (#9199)
1 parent 77dcc4f commit bab9dec

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

client/network/src/protocol/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ mod rep {
105105

106106
/// Reputation change when a peer sent us a status message with a different
107107
/// genesis than us.
108-
pub const GENESIS_MISMATCH: Rep = Rep::new(i32::min_value(), "Genesis mismatch");
108+
pub const GENESIS_MISMATCH: Rep = Rep::new(i32::MIN, "Genesis mismatch");
109109

110110
/// Reputation change for peers which send us a block with an incomplete header.
111111
pub const INCOMPLETE_HEADER: Rep = Rep::new(-(1 << 20), "Incomplete header");

client/network/src/state_request_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mod rep {
4242
use super::ReputationChange as Rep;
4343

4444
/// Reputation change when a peer sent us the same request multiple times.
45-
pub const SAME_REQUEST: Rep = Rep::new(i32::min_value(), "Same state request multiple times");
45+
pub const SAME_REQUEST: Rep = Rep::new(i32::MIN, "Same state request multiple times");
4646
}
4747

4848
/// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.

client/peerset/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnbounded
4545
pub use libp2p::PeerId;
4646

4747
/// We don't accept nodes whose reputation is under this value.
48-
const BANNED_THRESHOLD: i32 = 82 * (i32::min_value() / 100);
48+
const BANNED_THRESHOLD: i32 = 82 * (i32::MIN / 100);
4949
/// Reputation change for a node when we get disconnected from it.
5050
const DISCONNECT_REPUTATION_CHANGE: i32 = -256;
5151
/// Amount of time between the moment we disconnect from a node and the moment we remove it from
@@ -107,7 +107,7 @@ impl ReputationChange {
107107

108108
/// New reputation change that forces minimum possible reputation.
109109
pub const fn new_fatal(reason: &'static str) -> ReputationChange {
110-
ReputationChange { value: i32::min_value(), reason }
110+
ReputationChange { value: i32::MIN, reason }
111111
}
112112
}
113113

client/peerset/tests/fuzz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fn test_once() {
120120
// If we generate 2, adjust a random reputation.
121121
2 => {
122122
if let Some(id) = known_nodes.iter().choose(&mut rng) {
123-
let val = Uniform::new_inclusive(i32::min_value(), i32::MAX)
123+
let val = Uniform::new_inclusive(i32::MIN, i32::MAX)
124124
.sample(&mut rng);
125125
peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
126126
}

primitives/arithmetic/src/fixed_point.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ macro_rules! implement_fixed {
640640
};
641641

642642
// Min value fits.
643-
assert_eq!(from_i129::<i128>(a), Some(i128::min_value()));
643+
assert_eq!(from_i129::<i128>(a), Some(i128::MIN));
644644

645645
let a = I129 {
646646
value: i128::MAX as u128 + 1,
@@ -677,13 +677,13 @@ macro_rules! implement_fixed {
677677
let b = -1i32;
678678

679679
// Pos + Neg => Min.
680-
assert_eq!(to_bound::<_, _, i32>(a, b), i32::min_value());
680+
assert_eq!(to_bound::<_, _, i32>(a, b), i32::MIN);
681681

682682
let a = -1i32;
683683
let b = 1i32;
684684

685685
// Neg + Pos => Min.
686-
assert_eq!(to_bound::<_, _, i32>(a, b), i32::min_value());
686+
assert_eq!(to_bound::<_, _, i32>(a, b), i32::MIN);
687687

688688
let a = 1i32;
689689
let b = -1i32;
@@ -1092,29 +1092,29 @@ macro_rules! implement_fixed {
10921092

10931093
if $name::SIGNED {
10941094
// Min - 1.
1095-
assert_eq!(a.checked_mul_int((i128::min_value() + 1) / 2), Some(i128::min_value() + 2));
1095+
assert_eq!(a.checked_mul_int((i128::MIN + 1) / 2), Some(i128::MIN + 2));
10961096
// Min.
1097-
assert_eq!(a.checked_mul_int(i128::min_value() / 2), Some(i128::min_value()));
1097+
assert_eq!(a.checked_mul_int(i128::MIN / 2), Some(i128::MIN));
10981098
// Min + 1 => None.
1099-
assert_eq!(a.checked_mul_int(i128::min_value() / 2 - 1), None);
1099+
assert_eq!(a.checked_mul_int(i128::MIN / 2 - 1), None);
11001100

11011101
let b = $name::saturating_from_rational(1, -2);
11021102
assert_eq!(b.checked_mul_int(42i128), Some(-21));
11031103
assert_eq!(b.checked_mul_int(u128::MAX), None);
11041104
assert_eq!(b.checked_mul_int(i128::MAX), Some(i128::MAX / -2));
1105-
assert_eq!(b.checked_mul_int(i128::min_value()), Some(i128::min_value() / -2));
1105+
assert_eq!(b.checked_mul_int(i128::MIN), Some(i128::MIN / -2));
11061106
}
11071107

11081108
let a = $name::saturating_from_rational(1, 2);
11091109
assert_eq!(a.checked_mul_int(42i128), Some(21));
11101110
assert_eq!(a.checked_mul_int(i128::MAX), Some(i128::MAX / 2));
1111-
assert_eq!(a.checked_mul_int(i128::min_value()), Some(i128::min_value() / 2));
1111+
assert_eq!(a.checked_mul_int(i128::MIN), Some(i128::MIN / 2));
11121112

11131113
let c = $name::saturating_from_integer(255);
11141114
assert_eq!(c.checked_mul_int(2i8), None);
11151115
assert_eq!(c.checked_mul_int(2i128), Some(510));
11161116
assert_eq!(c.checked_mul_int(i128::MAX), None);
1117-
assert_eq!(c.checked_mul_int(i128::min_value()), None);
1117+
assert_eq!(c.checked_mul_int(i128::MIN), None);
11181118
}
11191119

11201120
#[test]
@@ -1128,30 +1128,30 @@ macro_rules! implement_fixed {
11281128
assert_eq!(a.saturating_mul_int(i128::MAX / 2 + 1), i128::MAX);
11291129

11301130
// Min - 1.
1131-
assert_eq!(a.saturating_mul_int((i128::min_value() + 1) / 2), i128::min_value() + 2);
1131+
assert_eq!(a.saturating_mul_int((i128::MIN + 1) / 2), i128::MIN + 2);
11321132
// Min.
1133-
assert_eq!(a.saturating_mul_int(i128::min_value() / 2), i128::min_value());
1133+
assert_eq!(a.saturating_mul_int(i128::MIN / 2), i128::MIN);
11341134
// Min + 1 => saturates to min.
1135-
assert_eq!(a.saturating_mul_int(i128::min_value() / 2 - 1), i128::min_value());
1135+
assert_eq!(a.saturating_mul_int(i128::MIN / 2 - 1), i128::MIN);
11361136

11371137
if $name::SIGNED {
11381138
let b = $name::saturating_from_rational(1, -2);
11391139
assert_eq!(b.saturating_mul_int(42i32), -21);
11401140
assert_eq!(b.saturating_mul_int(i128::MAX), i128::MAX / -2);
1141-
assert_eq!(b.saturating_mul_int(i128::min_value()), i128::min_value() / -2);
1142-
assert_eq!(b.saturating_mul_int(u128::MAX), u128::min_value());
1141+
assert_eq!(b.saturating_mul_int(i128::MIN), i128::MIN / -2);
1142+
assert_eq!(b.saturating_mul_int(u128::MAX), u128::MIN);
11431143
}
11441144

11451145
let a = $name::saturating_from_rational(1, 2);
11461146
assert_eq!(a.saturating_mul_int(42i32), 21);
11471147
assert_eq!(a.saturating_mul_int(i128::MAX), i128::MAX / 2);
1148-
assert_eq!(a.saturating_mul_int(i128::min_value()), i128::min_value() / 2);
1148+
assert_eq!(a.saturating_mul_int(i128::MIN), i128::MIN / 2);
11491149

11501150
let c = $name::saturating_from_integer(255);
11511151
assert_eq!(c.saturating_mul_int(2i8), i8::MAX);
1152-
assert_eq!(c.saturating_mul_int(-2i8), i8::min_value());
1152+
assert_eq!(c.saturating_mul_int(-2i8), i8::MIN);
11531153
assert_eq!(c.saturating_mul_int(i128::MAX), i128::MAX);
1154-
assert_eq!(c.saturating_mul_int(i128::min_value()), i128::min_value());
1154+
assert_eq!(c.saturating_mul_int(i128::MIN), i128::MIN);
11551155
}
11561156

11571157
#[test]
@@ -1232,13 +1232,13 @@ macro_rules! implement_fixed {
12321232
// Not executed by unsigned inners.
12331233
assert_eq!(a.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_max / (2 * accuracy))));
12341234
assert_eq!(a.checked_div_int(0.saturating_sub(inner_max / accuracy)), Some(0.saturating_sub(1)));
1235-
assert_eq!(b.checked_div_int(i128::min_value()), Some(0));
1235+
assert_eq!(b.checked_div_int(i128::MIN), Some(0));
12361236
assert_eq!(b.checked_div_int(inner_min / accuracy), Some(1));
12371237
assert_eq!(b.checked_div_int(1i8), None);
12381238
assert_eq!(b.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_min / (2 * accuracy))));
12391239
assert_eq!(b.checked_div_int(0.saturating_sub(inner_min / accuracy)), Some(0.saturating_sub(1)));
1240-
assert_eq!(c.checked_div_int(i128::min_value()), Some(0));
1241-
assert_eq!(d.checked_div_int(i32::min_value()), Some(0));
1240+
assert_eq!(c.checked_div_int(i128::MIN), Some(0));
1241+
assert_eq!(d.checked_div_int(i32::MIN), Some(0));
12421242
}
12431243

12441244
assert_eq!(b.checked_div_int(2), Some(inner_min / (2 * accuracy)));
@@ -1304,10 +1304,10 @@ macro_rules! implement_fixed {
13041304
assert_eq!($name::one().saturating_mul_acc_int(42i8), 2 * 42i8);
13051305

13061306
assert_eq!($name::one().saturating_mul_acc_int(i128::MAX), i128::MAX);
1307-
assert_eq!($name::one().saturating_mul_acc_int(i128::min_value()), i128::min_value());
1307+
assert_eq!($name::one().saturating_mul_acc_int(i128::MIN), i128::MIN);
13081308

13091309
assert_eq!($name::one().saturating_mul_acc_int(u128::MAX / 2), u128::MAX - 1);
1310-
assert_eq!($name::one().saturating_mul_acc_int(u128::min_value()), u128::min_value());
1310+
assert_eq!($name::one().saturating_mul_acc_int(u128::MIN), u128::MIN);
13111311

13121312
if $name::SIGNED {
13131313
let a = $name::saturating_from_rational(-1, 2);

primitives/arithmetic/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,16 +499,16 @@ mod threshold_compare_tests {
499499

500500
#[test]
501501
fn saturating_mul_works() {
502-
assert_eq!(Saturating::saturating_mul(2, i32::min_value()), i32::min_value());
502+
assert_eq!(Saturating::saturating_mul(2, i32::MIN), i32::MIN);
503503
assert_eq!(Saturating::saturating_mul(2, i32::MAX), i32::MAX);
504504
}
505505

506506
#[test]
507507
fn saturating_pow_works() {
508-
assert_eq!(Saturating::saturating_pow(i32::min_value(), 0), 1);
508+
assert_eq!(Saturating::saturating_pow(i32::MIN, 0), 1);
509509
assert_eq!(Saturating::saturating_pow(i32::MAX, 0), 1);
510-
assert_eq!(Saturating::saturating_pow(i32::min_value(), 3), i32::min_value());
511-
assert_eq!(Saturating::saturating_pow(i32::min_value(), 2), i32::MAX);
510+
assert_eq!(Saturating::saturating_pow(i32::MIN, 3), i32::MIN);
511+
assert_eq!(Saturating::saturating_pow(i32::MIN, 2), i32::MAX);
512512
assert_eq!(Saturating::saturating_pow(i32::MAX, 2), i32::MAX);
513513
}
514514
}

primitives/runtime-interface/test-wasm/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ wasm_export_functions! {
230230
assert_eq!(*val, test_api::get_and_return_u128(*val));
231231
}
232232

233-
for val in &[i128::MAX, i128::min_value(), 1i128, 5000i128, u64::MAX as i128] {
233+
for val in &[i128::MAX, i128::MIN, 1i128, 5000i128, u64::MAX as i128] {
234234
assert_eq!(*val, test_api::get_and_return_i128(*val));
235235
}
236236
}

0 commit comments

Comments
 (0)