[1.1.1]

GoodforGod · GoodforGod · commit 412f99b2b719 · 2021-11-01T00:50:24.000+03:00
ProxyBlockApiTest self queue with longer timeout
diff --git a/src/test/java/io/api/ApiRunner.java b/src/test/java/io/api/ApiRunner.java
@@ -11,23 +11,23 @@ public class ApiRunner extends Assert {
     private static final EtherScanApi apiRopsten;
     private static final EtherScanApi apiRinkeby;
     private static final EtherScanApi apiKovan;
-    private static final String key;
+    private static final String apiKey;
 
     static {
-        final String apiKey = System.getenv("API_KEY");
-        key = (apiKey == null || apiKey.isEmpty())
+        final String key = System.getenv("API_KEY");
+        apiKey = (key == null || key.isEmpty())
                 ? EtherScanApi.DEFAULT_KEY
-                : apiKey;
+                : key;
 
         final QueueManager queueManager = new QueueManager(2, 2100L, 2100L, 0);
-        api = new EtherScanApi(key, EthNetwork.MAINNET, queueManager);
-        apiKovan = new EtherScanApi(key, EthNetwork.KOVAN, queueManager);
-        apiRopsten = new EtherScanApi(key, EthNetwork.ROPSTEN, queueManager);
-        apiRinkeby = new EtherScanApi(key, EthNetwork.RINKEBY, queueManager);
+        api = new EtherScanApi(ApiRunner.apiKey, EthNetwork.MAINNET, queueManager);
+        apiKovan = new EtherScanApi(ApiRunner.apiKey, EthNetwork.KOVAN, queueManager);
+        apiRopsten = new EtherScanApi(ApiRunner.apiKey, EthNetwork.ROPSTEN, queueManager);
+        apiRinkeby = new EtherScanApi(ApiRunner.apiKey, EthNetwork.RINKEBY, queueManager);
     }
 
-    public static String getKey() {
-        return key;
+    public static String getApiKey() {
+        return apiKey;
     }
 
     public static EtherScanApi getApi() {
diff --git a/src/test/java/io/api/etherscan/EtherScanApiTest.java b/src/test/java/io/api/etherscan/EtherScanApiTest.java
@@ -79,7 +79,7 @@ public void noTimeoutUnlimitedAwait() {
     public void timeout() throws InterruptedException {
         TimeUnit.SECONDS.sleep(5);
         Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(300, 300);
-        EtherScanApi api = new EtherScanApi(getKey(), EthNetwork.KOVAN, supplier);
+        EtherScanApi api = new EtherScanApi(getApiKey(), EthNetwork.KOVAN, supplier);
         List<Block> blocks = api.account().minedBlocks("0x0010f94b296A852aAac52EA6c5Ac72e03afD032D");
         assertNotNull(blocks);
     }
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyBlockApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyBlockApiTest.java
@@ -1,6 +1,9 @@
 package io.api.etherscan.proxy;
 
 import io.api.ApiRunner;
+import io.api.etherscan.core.impl.EtherScanApi;
+import io.api.etherscan.manager.impl.QueueManager;
+import io.api.etherscan.model.EthNetwork;
 import io.api.etherscan.model.proxy.BlockProxy;
 import org.junit.Test;
 
@@ -14,9 +17,16 @@
  */
 public class ProxyBlockApiTest extends ApiRunner {
 
+    private final EtherScanApi api;
+
+    public ProxyBlockApiTest() {
+        final QueueManager queueManager = new QueueManager(1, 5100L, 5100L, 0);
+        this.api = new EtherScanApi(getApiKey(), EthNetwork.MAINNET, queueManager);
+    }
+
     @Test
     public void correct() {
-        Optional<BlockProxy> block = getApi().proxy().block(5120);
+        Optional<BlockProxy> block = api.proxy().block(5120);
         assertTrue(block.isPresent());
         BlockProxy proxy = block.get();
         assertNotNull(proxy.getHash());
@@ -49,13 +59,13 @@ public void correct() {
 
     @Test
     public void correctParamWithEmptyExpectedResult() {
-        Optional<BlockProxy> block = getApi().proxy().block(99999999999L);
+        Optional<BlockProxy> block = api.proxy().block(99999999999L);
         assertFalse(block.isPresent());
     }
 
     @Test
     public void correctParamNegativeNo() {
-        Optional<BlockProxy> block = getApi().proxy().block(-1);
+        Optional<BlockProxy> block = api.proxy().block(-1);
         assertTrue(block.isPresent());
         assertNotNull(block.get().getHash());
     }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void noTimeoutUnlimitedAwait() {`
`79`	`79`	`public void timeout() throws InterruptedException {`
`80`	`80`	`TimeUnit.SECONDS.sleep(5);`
`81`	`81`	`Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(300, 300);`
`82`		`- EtherScanApi api = new EtherScanApi(getKey(), EthNetwork.KOVAN, supplier);`
	`82`	`+ EtherScanApi api = new EtherScanApi(getApiKey(), EthNetwork.KOVAN, supplier);`
`83`	`83`	`List<Block> blocks = api.account().minedBlocks("0x0010f94b296A852aAac52EA6c5Ac72e03afD032D");`
`84`	`84`	`assertNotNull(blocks);`
`85`	`85`	`}`