Merge pull request #1982 from ManfredKarrer/remove-ico-tokens-and-btc2

Remove ico tokens and btc2
bisq-network · Nov 27, 2018 · d142ad8 · d142ad8
2 parents 6acc0cd + 9d20fb2
commit d142ad8
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 370 deletions.
diff --git a/assets/src/main/java/bisq/asset/AddressValidationResult.java b/assets/src/main/java/bisq/asset/AddressValidationResult.java
@@ -27,7 +27,7 @@
  */
 public class AddressValidationResult {
 
-    private static AddressValidationResult VALID_ADDRESS = new AddressValidationResult(true, "", "");
+    private static final AddressValidationResult VALID_ADDRESS = new AddressValidationResult(true, "", "");
 
     private final boolean isValid;
     private final String message;

diff --git a/assets/src/main/java/bisq/asset/PrintTool.java b/assets/src/main/java/bisq/asset/PrintTool.java
@@ -41,8 +41,8 @@ public static void main(String[] args) {
     }
 
     private static class Pair {
-        String left;
-        String right;
+        final String left;
+        final String right;
 
         Pair(String left, String right) {
             this.left = left;

diff --git a/assets/src/main/java/bisq/asset/coins/Bitcoin2.java b/assets/src/main/java/bisq/asset/coins/Bitcoin2.java
diff --git a/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java b/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java
@@ -17,11 +17,9 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Coin;
 import bisq.asset.Base58BitcoinAddressValidator;
-
+import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
-import org.bitcoinj.core.NetworkParameters;
 
 public class BitcoinRhodium extends Coin {
 

diff --git a/assets/src/main/java/bisq/asset/coins/FuturoCoin.java b/assets/src/main/java/bisq/asset/coins/FuturoCoin.java
diff --git a/assets/src/main/java/bisq/asset/coins/Loki.java b/assets/src/main/java/bisq/asset/coins/Loki.java
diff --git a/assets/src/main/java/bisq/asset/coins/QRL.java b/assets/src/main/java/bisq/asset/coins/QRL.java
diff --git a/assets/src/main/java/bisq/asset/tokens/GreenBlockCoin.java b/assets/src/main/java/bisq/asset/tokens/GreenBlockCoin.java
diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset
@@ -3,7 +3,6 @@
 # See bisq.asset.Asset and bisq.asset.AssetRegistry for further details.
 # See https://bisq.network/list-asset for complete instructions.
 bisq.asset.coins.Actinium
-bisq.asset.coins.Bitcoin2
 bisq.asset.coins.BitcoinCash
 bisq.asset.coins.BitcoinClashic
 bisq.asset.coins.BitcoinRhodium
@@ -31,7 +30,6 @@ bisq.asset.coins.Kekcoin
 bisq.asset.coins.Litecoin$Mainnet
 bisq.asset.coins.Litecoin$Regtest
 bisq.asset.coins.Litecoin$Testnet
-bisq.asset.coins.Loki
 bisq.asset.coins.Mask
 bisq.asset.coins.MobitGlobal
 bisq.asset.coins.Monero
@@ -42,7 +40,6 @@ bisq.asset.coins.Neos
 bisq.asset.coins.PIVX
 bisq.asset.coins.PZDC
 bisq.asset.coins.QMCoin
-bisq.asset.coins.QRL
 bisq.asset.coins.Radium
 bisq.asset.coins.Ryo
 bisq.asset.coins.Siafund
@@ -57,4 +54,3 @@ bisq.asset.coins.ZenCash
 bisq.asset.coins.Zero
 bisq.asset.coins.ZeroOneCoin
 bisq.asset.tokens.EtherStone
-bisq.asset.tokens.GreenBlockCoin
diff --git a/assets/src/test/java/bisq/asset/coins/Bitcoin2Test.java b/assets/src/test/java/bisq/asset/coins/Bitcoin2Test.java
diff --git a/assets/src/test/java/bisq/asset/coins/LokiTest.java b/assets/src/test/java/bisq/asset/coins/LokiTest.java
diff --git a/assets/src/test/java/bisq/asset/coins/QRLTest.java b/assets/src/test/java/bisq/asset/coins/QRLTest.java