Clean up of old Ethereum provider classes

thomasWos · Jul 10, 2023 · 875bd7a · 875bd7a
1 parent 26a0c60
commit 875bd7a
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 272 deletions.
diff --git a/src/main/java/com/allmycoins/Main.java b/src/main/java/com/allmycoins/Main.java
@@ -30,7 +30,7 @@
 import com.allmycoins.balance.coinspot.CoinspotProvider;
 import com.allmycoins.balance.cosmosjs.CosmosJsProviders;
 import com.allmycoins.balance.cryptocom.CryptocomProvider;
-import com.allmycoins.balance.ethereum.EthProvider2;
+import com.allmycoins.balance.ethereum.EthProvider;
 import com.allmycoins.balance.ethereum2.Eth2Provider;
 import com.allmycoins.balance.harmony.HarmonyProvider;
 import com.allmycoins.balance.litecoin.LitecoinProvider;
@@ -84,7 +84,7 @@ public static void main(String[] args) {
 
 		List<BalanceProvider> balanceProviders = new ArrayList<>();
 
-		List<BalanceProvider> staticProviders = List.of(new EthProvider2(), new BinanceProvider(),
+		List<BalanceProvider> staticProviders = List.of(new EthProvider(), new BinanceProvider(),
 				new CoinspotProvider(), new CryptocomProvider(), new MultiversXProvider(), new OkexProvider(),
 				new SwyftxProvider(), new HarmonyProvider(), new AlgorandProvider(), new TezosProvider(),
 				new BitcoinProvider(), new SolanaProvider(), new BscProvider(), new CardanoProvider(),

diff --git a/src/main/java/com/allmycoins/balance/ethereum/AmberdataEthTokensJson.java b/src/main/java/com/allmycoins/balance/ethereum/AmberdataEthTokensJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/AmberdataEthTokensRequest.java b/src/main/java/com/allmycoins/balance/ethereum/AmberdataEthTokensRequest.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/BuildAmberdataEthTokensBalances.java b/src/main/java/com/allmycoins/balance/ethereum/BuildAmberdataEthTokensBalances.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/BuildEtherscanBalance.java b/src/main/java/com/allmycoins/balance/ethereum/BuildEtherscanBalance.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthProvider.java b/src/main/java/com/allmycoins/balance/ethereum/EthProvider.java
@@ -1,38 +1,34 @@
 package com.allmycoins.balance.ethereum;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
+import java.util.stream.Collectors;
 
 import com.allmycoins.balance.PublicAddressBalanceProvider;
 import com.allmycoins.json.BalanceJson;
+import com.allmycoins.utils.BigDecimalUtils;
 import com.allmycoins.utils.FutureUtils;
 import com.allmycoins.utils.RequestUtils;
 
 public final class EthProvider implements PublicAddressBalanceProvider {
 
 	@Override
 	public List<BalanceJson> balance(String publicAddress) {
-		Future<EtherscanBalanceJson> futureEtherBalanceJson = RequestUtils
-				.sendRequestFuture(new EtherscanBalanceRequest(publicAddress));
+		Future<CovalentBalancesJson> futureAmberdataEthTokensJson = RequestUtils
+				.sendRequestFuture(new CovalentBalancesRequest(publicAddress));
 
-		Future<AmberdataEthTokensJson> futureAmberdataEthTokensJson = RequestUtils
-				.sendRequestFuture(new AmberdataEthTokensRequest(publicAddress));
+		CovalentBalancesJson covalentBalancesJson = FutureUtils.futureResult(futureAmberdataEthTokensJson);
 
-		BalanceJson ethBalance = BuildEtherscanBalance.build(FutureUtils.futureResult(futureEtherBalanceJson));
-		List<BalanceJson> amberdataEthTokensBalances = BuildAmberdataEthTokensBalances
-				.build(FutureUtils.futureResult(futureAmberdataEthTokensJson));
+		List<CovalentBalanceItemJson> list = List.of(covalentBalancesJson.getData().getItems());
 
-		List<BalanceJson> etherBalances = new ArrayList<>();
-		etherBalances.add(ethBalance);
-		etherBalances.addAll(amberdataEthTokensBalances);
-
-		return etherBalances;
+		return list.stream()
+				.map(i -> new BalanceJson(i.getContract_ticker_symbol(),
+						BigDecimalUtils.decimal(i.getBalance(), i.getContract_decimals()), "ETH wallet"))
+				.collect(Collectors.toList());
 	}
 
 	@Override
 	public String privateConfigKey() {
 		return "ETH_ADDRESS";
 	}
-
 }
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthProvider2.java b/src/main/java/com/allmycoins/balance/ethereum/EthProvider2.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthTokenAmountJson.java b/src/main/java/com/allmycoins/balance/ethereum/EthTokenAmountJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthTokenPayloadJson.java b/src/main/java/com/allmycoins/balance/ethereum/EthTokenPayloadJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthTokenPriceJson.java b/src/main/java/com/allmycoins/balance/ethereum/EthTokenPriceJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EthTokenRecordJson.java b/src/main/java/com/allmycoins/balance/ethereum/EthTokenRecordJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EtherscanBalanceJson.java b/src/main/java/com/allmycoins/balance/ethereum/EtherscanBalanceJson.java
diff --git a/src/main/java/com/allmycoins/balance/ethereum/EtherscanBalanceRequest.java b/src/main/java/com/allmycoins/balance/ethereum/EtherscanBalanceRequest.java
diff --git a/src/test/java/com/allmycoins/balance/EthereumProviderTest.java b/src/test/java/com/allmycoins/balance/EthereumProviderTest.java
@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.allmycoins.PrivateConfig;
-import com.allmycoins.balance.ethereum.EthProvider2;
+import com.allmycoins.balance.ethereum.EthProvider;
 import com.allmycoins.json.BalanceJson;
 
 class EthereumProviderTest {
@@ -17,7 +17,7 @@ class EthereumProviderTest {
 	void testBalances() {
 		PrivateConfig.loadConfigurationFromClassLoader();
 
-		EthProvider2 ethereumProvider = new EthProvider2();
+		EthProvider ethereumProvider = new EthProvider();
 		List<BalanceJson> balance = ethereumProvider.balances();
 		assertTrue(balance.size() >= 1);
 		BalanceJson ethereumBalanceJson = balance.get(0);
@@ -31,7 +31,7 @@ void testBalances() {
 	void testNoBalances() {
 		PrivateConfig.clearConfiguration();
 
-		EthProvider2 ethereumProvider = new EthProvider2();
+		EthProvider ethereumProvider = new EthProvider();
 		List<BalanceJson> balance = ethereumProvider.balances();
 		assertTrue(balance.isEmpty());
 	}