mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 21:32:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

base, wallet: migrate Guava LongMath.checked{Add,Subtract,Multiply} to Math.{add,substract,multiply}Exact

Browse Source
This commit is contained in:
Sean Gilligan 2023-02-27 16:13:10 -08:00 committed by Andreas Schildbach
parent 0e4bda3cd8
commit 64dbdd9fcd
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/base/Coin.java
View File

@ -217,7 +217,7 @@ public final class Coin implements Monetary, Comparable<Coin> {
}
public Coin add(final Coin value) {
return Coin.valueOf(LongMath.checkedAdd(this.value, value.value));
return Coin.valueOf(Math.addExact(this.value, value.value));
}
/** Alias for add */
@ -226,7 +226,7 @@ public final class Coin implements Monetary, Comparable<Coin> {
}
public Coin subtract(final Coin value) {
return Coin.valueOf(LongMath.checkedSubtract(this.value, value.value));
return Coin.valueOf(Math.subtractExact(this.value, value.value));
}
/** Alias for subtract */
@ -235,7 +235,7 @@ public final class Coin implements Monetary, Comparable<Coin> {
}
public Coin multiply(final long factor) {
return Coin.valueOf(LongMath.checkedMultiply(this.value, factor));
return Coin.valueOf(Math.multiplyExact(this.value, factor));
}
/** Alias for multiply */

7
core/src/main/java/org/bitcoinj/base/utils/Fiat.java
View File

@ -16,7 +16,6 @@
package org.bitcoinj.base.utils;
import com.google.common.math.LongMath;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.Monetary;
@ -107,16 +106,16 @@ public final class Fiat implements Monetary, Comparable<Fiat> {
public Fiat add(final Fiat value) {
checkArgument(value.currencyCode.equals(currencyCode));
return new Fiat(currencyCode, LongMath.checkedAdd(this.value, value.value));
return new Fiat(currencyCode, Math.addExact(this.value, value.value));
}
public Fiat subtract(final Fiat value) {
checkArgument(value.currencyCode.equals(currencyCode));
return new Fiat(currencyCode, LongMath.checkedSubtract(this.value, value.value));
return new Fiat(currencyCode, Math.subtractExact(this.value, value.value));
}
public Fiat multiply(final long factor) {
return new Fiat(currencyCode, LongMath.checkedMultiply(this.value, factor));
return new Fiat(currencyCode, Math.multiplyExact(this.value, factor));
}
public Fiat divide(final long divisor) {

3
core/src/main/java/org/bitcoinj/base/utils/MonetaryFormat.java
View File

@ -29,7 +29,6 @@ import java.util.Objects;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.math.LongMath.checkedMultiply;
import static com.google.common.math.LongMath.checkedPow;
import static com.google.common.math.LongMath.divide;
@ -367,7 +366,7 @@ public final class MonetaryFormat {
long satoshis = Math.abs(monetary.getValue());
int potentialDecimals = smallestUnitExponent - shift;
long precisionDivisor = checkedPow(10, potentialDecimals - maxDecimals);
satoshis = checkedMultiply(divide(satoshis, precisionDivisor, roundingMode), precisionDivisor);
satoshis = Math.multiplyExact(divide(satoshis, precisionDivisor, roundingMode), precisionDivisor);
// shifting
long shiftDivisor = checkedPow(10, potentialDecimals);

3
core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java
View File

@ -17,7 +17,6 @@
package org.bitcoinj.wallet;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.math.LongMath;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.Transaction;
@ -58,7 +57,7 @@ public class DefaultCoinSelector implements CoinSelector {
// Only pick chain-included transactions, or transactions that are ours and pending.
if (!shouldSelect(output.getParentTransaction())) continue;
selected.add(output);
total = LongMath.checkedAdd(total, output.getValue().value);
total = Math.addExact(total, output.getValue().value);
}
// Total may be lower than target here, if the given candidates were insufficient to create to requested
// transaction.