Make codacy happy

bisq-network · Sep 17, 2020 · 90681bf · 90681bf
1 parent 8a66c5e
commit 90681bf
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/assets/src/main/java/bisq/asset/coins/Bitcoin.java b/assets/src/main/java/bisq/asset/coins/Bitcoin.java
@@ -17,7 +17,6 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58AddressValidator;
 import bisq.asset.BitcoinAddressValidator;
 import bisq.asset.Coin;
 

diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
@@ -37,7 +37,6 @@
 import org.bitcoinj.core.Context;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.listeners.TransactionConfidenceEventListener;
 import org.bitcoinj.script.ScriptException;

diff --git a/core/src/main/java/bisq/core/util/coin/BsqFormatter.java b/core/src/main/java/bisq/core/util/coin/BsqFormatter.java
@@ -107,11 +107,12 @@ public String getBsqAddressStringFromAddress(Address address) {
     }
 
     public LegacyAddress getAddressFromBsqAddress(String encoded) {
+        String maybeUpdatedEncoded = encoded;
         if (useBsqAddressFormat)
-            encoded = encoded.substring(prefix.length(), encoded.length());
+            maybeUpdatedEncoded = encoded.substring(prefix.length(), encoded.length());
 
         try {
-            return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), encoded);
+            return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), maybeUpdatedEncoded);
         } catch (AddressFormatException e) {
             throw new RuntimeException(e);
         }

diff --git a/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java b/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java
@@ -23,7 +23,6 @@
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.LegacyAddress;
 
 import javax.inject.Inject;
 

diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java
@@ -70,7 +70,6 @@
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.uri.BitcoinURI;
 import org.bitcoinj.utils.Fiat;