Merge pull request #2434 from ManfredKarrer/remove-not-traded-assets

Remove not traded assets
bisq-network · Feb 18, 2019 · dc8fa91 · dc8fa91
2 parents 8e4c2c6 + 744ff48
commit dc8fa91
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 219 deletions.
diff --git a/assets/src/main/java/bisq/asset/coins/Gridcoin.java b/assets/src/main/java/bisq/asset/coins/Gridcoin.java
diff --git a/assets/src/main/java/bisq/asset/coins/LitecoinZ.java b/assets/src/main/java/bisq/asset/coins/LitecoinZ.java
diff --git a/assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java b/assets/src/main/java/bisq/asset/coins/ZeroOneCoin.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
@@ -36,14 +36,12 @@ bisq.asset.coins.EtherClassic
 bisq.asset.coins.FourtyTwo
 bisq.asset.coins.Fujicoin
 bisq.asset.coins.GambleCoin
-bisq.asset.coins.Gridcoin
 bisq.asset.coins.Grin
 bisq.asset.coins.Horizen
 bisq.asset.coins.IdaPay
 bisq.asset.coins.Iridium
 bisq.asset.coins.Kekcoin
 bisq.asset.coins.Litecoin
-bisq.asset.coins.LitecoinZ
 bisq.asset.coins.Lytix
 bisq.asset.coins.Mask
 bisq.asset.coins.Mile
@@ -78,7 +76,6 @@ bisq.asset.coins.Zcash
 bisq.asset.coins.Zcoin
 bisq.asset.coins.ZelCash
 bisq.asset.coins.Zero
-bisq.asset.coins.ZeroOneCoin
 bisq.asset.tokens.AugmintEuro
 bisq.asset.tokens.DaiStablecoin
 bisq.asset.tokens.EtherStone

diff --git a/assets/src/test/java/bisq/asset/coins/GridcoinTest.java b/assets/src/test/java/bisq/asset/coins/GridcoinTest.java
diff --git a/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java b/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java
diff --git a/assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java b/assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java
diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java
@@ -132,7 +132,6 @@ public static List<CryptoCurrency> getMainCryptoCurrencies() {
         result.add(new CryptoCurrency("DASH", "Dash"));
         result.add(new CryptoCurrency("DCR", "Decred"));
         result.add(new CryptoCurrency("ETH", "Ether"));
-        result.add(new CryptoCurrency("GRC", "Gridcoin"));
         result.add(new CryptoCurrency("GRIN", "Grin"));
         result.add(new CryptoCurrency("LTC", "Litecoin"));
         result.add(new CryptoCurrency("XMR", "Monero"));
@@ -152,6 +151,9 @@ public static List<CryptoCurrency> getRemovedCryptoCurrencies() {
         currencies.add(new CryptoCurrency("SC", "SpaceCash"));
         currencies.add(new CryptoCurrency("PPI", "PiedPiper Coin"));
         currencies.add(new CryptoCurrency("PEPECASH", "Pepe Cash"));
+        currencies.add(new CryptoCurrency("GRC", "Gridcoin"));
+        currencies.add(new CryptoCurrency("LTZ", "LitecoinZ"));
+        currencies.add(new CryptoCurrency("ZOC", "01coin"));
         return currencies;
     }
 

diff --git a/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java b/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java
@@ -141,7 +141,7 @@ public void onAllServicesInitialized() {
                 "\n\n" + newAssets.toString() +
                 "\n\n" + sufficientlyTraded.toString();
         // Utilities.copyToClipboard(result);
-        log.debug(result);
+        log.info(result);
     }
 
     private boolean isWarmingUp(String code) {
@@ -194,6 +194,28 @@ private boolean isWarmingUp(String code) {
         newlyAdded.add("WEB");
         newlyAdded.add("WRKZ");
 
+        // v0.9.3 - nothing added, was hotfix
+
+        // v0.9.4 (Feb 18 2019)
+        newlyAdded.add("ADE");
+        newlyAdded.add("ASK");
+        newlyAdded.add("AEUR");
+        newlyAdded.add("AUS");
+        newlyAdded.add("CASH2");
+        newlyAdded.add("DARX");
+        newlyAdded.add("CRDS");
+        newlyAdded.add("CRCL");
+        newlyAdded.add("DAI");
+        newlyAdded.add("ONION");
+        newlyAdded.add("FJC");
+        newlyAdded.add("LYTX");
+        newlyAdded.add("MILE");
+        newlyAdded.add("PRSN");
+        newlyAdded.add("TUSD");
+        newlyAdded.add("USDC");
+        newlyAdded.add("VXV");
+        newlyAdded.add("ZEL");
+
         return newlyAdded.contains(code);
     }
 }
diff --git a/core/src/test/java/bisq/core/trade/TradableListTest.java b/core/src/test/java/bisq/core/trade/TradableListTest.java
@@ -33,6 +33,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+//TODO cannot be run in IntelliJ IDE as parameter is not supported. OfferPayload is final so it is not so trivial to
+// replace that.
 public class TradableListTest {
 
     @Test