Skip to content

Commit 965051d

Browse files
committed
fix: replace forbidden java.lang.Math with if-else clamping
1 parent 6ccb0c7 commit 965051d

1 file changed

Lines changed: 14 additions & 10 deletions

File tree

common/src/main/java/org/tron/core/config/args/CommitteeConfig.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,26 @@ private void postProcess() {
176176
}
177177

178178
// clamp allowDelegateOptimization to 0-1
179-
allowDelegateOptimization = Math.max(0, Math.min(allowDelegateOptimization, 1));
179+
if (allowDelegateOptimization < 0) { allowDelegateOptimization = 0; }
180+
if (allowDelegateOptimization > 1) { allowDelegateOptimization = 1; }
180181

181182
// clamp allowDynamicEnergy to 0-1
182-
allowDynamicEnergy = Math.max(0, Math.min(allowDynamicEnergy, 1));
183+
if (allowDynamicEnergy < 0) { allowDynamicEnergy = 0; }
184+
if (allowDynamicEnergy > 1) { allowDynamicEnergy = 1; }
183185

184186
// clamp dynamicEnergyThreshold to 0-100_000_000_000_000_000
185-
dynamicEnergyThreshold = Math.max(0,
186-
Math.min(dynamicEnergyThreshold, 100_000_000_000_000_000L));
187+
if (dynamicEnergyThreshold < 0) { dynamicEnergyThreshold = 0; }
188+
if (dynamicEnergyThreshold > 100_000_000_000_000_000L) {
189+
dynamicEnergyThreshold = 100_000_000_000_000_000L;
190+
}
187191

188-
// clamp dynamicEnergyIncreaseFactor
189-
dynamicEnergyIncreaseFactor = Math.max(0,
190-
Math.min(dynamicEnergyIncreaseFactor, 10_000L));
192+
// clamp dynamicEnergyIncreaseFactor to 0-10_000
193+
if (dynamicEnergyIncreaseFactor < 0) { dynamicEnergyIncreaseFactor = 0; }
194+
if (dynamicEnergyIncreaseFactor > 10_000L) { dynamicEnergyIncreaseFactor = 10_000L; }
191195

192-
// clamp dynamicEnergyMaxFactor
193-
dynamicEnergyMaxFactor = Math.max(0,
194-
Math.min(dynamicEnergyMaxFactor, 100_000L));
196+
// clamp dynamicEnergyMaxFactor to 0-100_000
197+
if (dynamicEnergyMaxFactor < 0) { dynamicEnergyMaxFactor = 0; }
198+
if (dynamicEnergyMaxFactor > 100_000L) { dynamicEnergyMaxFactor = 100_000L; }
195199

196200
// cross-field: allowOldRewardOpt requires at least one reward/vote flag
197201
if (allowOldRewardOpt == 1 && allowNewRewardAlgorithm != 1

0 commit comments

Comments
 (0)