[1.1.0-SNAPSHOT]

GoodforGod · GoodforGod · commit ea512d1612ae · 2020-10-18T16:50:17.000+03:00
FailFast true added

[1.1.0-SNAPSHOT]
Only java 11 for testing is left

[1.1.0-SNAPSHOT]
Tests on push disabled for RateLimit not exceed

[1.1.0-SNAPSHOT]
CI api key env setted

[1.1.0-SNAPSHOT]
QueueManager 7 sec instead of 6 set

[1.1.0-SNAPSHOT]
Test fixed with correct address for ABI
Debug logging removed
PersonalQueue optimized

[1.1.0-SNAPSHOT]
Key removed

[1.1.0-SNAPSHOT]
Weak queue set for tests

[1.1.0-SNAPSHOT]
Rest before timeout check for api not exceed rate
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,10 +1,6 @@
 name: Java CI
 
 on:   
-  push:
-    branches:
-    - master
-    - dev
   schedule:
   - cron: "0 12 1 * *"
   pull_request:
@@ -17,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8', '11' ]
+        java: [ '11' ]
     name: Java ${{ matrix.java }} setup
 
     steps:
@@ -30,9 +26,12 @@ jobs:
 
     - name: Build with Gradle
       run: ./gradlew build jacocoTestReport
+      env:
+        API_KEY: ${{ secrets.API_KEY }}
 
     - name: Analyze with SonarQube
       run: ./gradlew sonarqube
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        API_KEY: ${{ secrets.API_KEY }}
diff --git a/build.gradle b/build.gradle
@@ -43,6 +43,8 @@ dependencies {
 }
 
 test {
+    failFast = true
+
     useJUnit()
     testLogging {
         events "passed", "skipped", "failed"
diff --git a/src/main/java/io/api/etherscan/core/impl/BasicProvider.java b/src/main/java/io/api/etherscan/core/impl/BasicProvider.java
@@ -7,14 +7,10 @@
 import io.api.etherscan.error.RateLimitException;
 import io.api.etherscan.executor.IHttpExecutor;
 import io.api.etherscan.manager.IQueueManager;
-import io.api.etherscan.manager.impl.QueueManager;
 import io.api.etherscan.model.utility.StringResponseTO;
 import io.api.etherscan.util.BasicUtils;
 
-import java.time.LocalTime;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Base provider for API Implementations
@@ -25,8 +21,6 @@
  */
 abstract class BasicProvider {
 
-    private static final Logger logger = Logger.getLogger(QueueManager.class.getName());
-
     static final int MAX_END_BLOCK = Integer.MAX_VALUE;
     static final int MIN_START_BLOCK = 0;
 
@@ -76,9 +70,7 @@ <T> T convert(final String json, final Class<T> tClass) {
     }
 
     String getRequest(final String urlParameters) {
-        logger.log(Level.SEVERE, "ASKED - " + LocalTime.now());
         queue.takeTurn();
-        logger.log(Level.SEVERE, "GRANTED - " + LocalTime.now());
         final String url = baseUrl + module + urlParameters;
         final String result = executor.get(url);
         if (BasicUtils.isEmpty(result))
@@ -88,9 +80,7 @@ String getRequest(final String urlParameters) {
     }
 
     String postRequest(final String urlParameters, final String dataToPost) {
-        logger.log(Level.SEVERE, "ASKED - " + LocalTime.now());
         queue.takeTurn();
-        logger.log(Level.SEVERE, "GRANTED - " + LocalTime.now());
         final String url = baseUrl + module + urlParameters;
         return executor.post(url, dataToPost);
     }
diff --git a/src/main/java/io/api/etherscan/manager/impl/QueueManager.java b/src/main/java/io/api/etherscan/manager/impl/QueueManager.java
@@ -5,7 +5,7 @@
 import java.util.concurrent.*;
 
 /**
- * Queue implementation With size and reset time as params
+ * Queue Semaphore implementation with size and reset time as params
  * 
  * @see IQueueManager
  *
@@ -14,19 +14,19 @@
  */
 public class QueueManager implements IQueueManager {
 
-    public static final QueueManager DEFAULT_KEY_QUEUE = new QueueManager(1, 6);
-    public static final QueueManager PERSONAL_KEY_QUEUE = new QueueManager(5, 1);
+    public static final QueueManager DEFAULT_KEY_QUEUE = new QueueManager(1, 7);
+    public static final QueueManager PERSONAL_KEY_QUEUE = new QueueManager(2, 1);
 
     private final Semaphore semaphore;
 
-    public QueueManager(int queueSize, int queueResetTimeInSec) {
-        this(queueSize, queueResetTimeInSec, queueResetTimeInSec);
+    public QueueManager(int size, int resetInSec) {
+        this(size, resetInSec, resetInSec);
     }
 
-    public QueueManager(int queueSize, int queueResetTimeInSec, int delayInSec) {
-        this.semaphore = new Semaphore(queueSize);
+    public QueueManager(int size, int queueResetTimeInSec, int delayInSec) {
+        this.semaphore = new Semaphore(size);
         Executors.newSingleThreadScheduledExecutor()
-                .scheduleAtFixedRate(releaseLocks(queueSize), delayInSec, queueResetTimeInSec, TimeUnit.SECONDS);
+                .scheduleAtFixedRate(releaseLocks(size), delayInSec, queueResetTimeInSec, TimeUnit.SECONDS);
     }
 
     @Override
diff --git a/src/test/java/io/api/ApiRunner.java b/src/test/java/io/api/ApiRunner.java
@@ -11,21 +11,26 @@ 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;
 
     static {
         final String apiKey = System.getenv("API_KEY");
-        final String keyOrDefault = (apiKey == null || apiKey.isEmpty())
+        key = (apiKey == null || apiKey.isEmpty())
                 ? EtherScanApi.DEFAULT_KEY
                 : apiKey;
 
-        final QueueManager queue = keyOrDefault.equals(EtherScanApi.DEFAULT_KEY)
+        final QueueManager queue = key.equals(EtherScanApi.DEFAULT_KEY)
                 ? QueueManager.DEFAULT_KEY_QUEUE
-                : QueueManager.PERSONAL_KEY_QUEUE;
+                : new QueueManager(1, 2);
 
-        api = new EtherScanApi(keyOrDefault, EthNetwork.MAINNET, queue);
-        apiRopsten = new EtherScanApi(keyOrDefault, EthNetwork.ROPSTEN, queue);
-        apiRinkeby = new EtherScanApi(keyOrDefault, EthNetwork.RINKEBY, queue);
-        apiKovan = new EtherScanApi(keyOrDefault, EthNetwork.KOVAN, queue);
+        api = new EtherScanApi(key, EthNetwork.MAINNET, queue);
+        apiRopsten = new EtherScanApi(key, EthNetwork.ROPSTEN, queue);
+        apiRinkeby = new EtherScanApi(key, EthNetwork.RINKEBY, queue);
+        apiKovan = new EtherScanApi(key, EthNetwork.KOVAN, queue);
+    }
+
+    public static String getKey() {
+        return key;
     }
 
     public static EtherScanApi getApi() {
diff --git a/src/test/java/io/api/etherscan/EtherScanApiTest.java b/src/test/java/io/api/etherscan/EtherScanApiTest.java
@@ -13,6 +13,7 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 /**
@@ -75,9 +76,10 @@ public void noTimeoutUnlimitedAwait() {
     }
 
     @Test(expected = ApiTimeoutException.class)
-    public void timeout() {
+    public void timeout() throws InterruptedException {
+        TimeUnit.SECONDS.sleep(5);
         Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(300, 300);
-        EtherScanApi api = new EtherScanApi(EthNetwork.KOVAN, supplier);
+        EtherScanApi api = new EtherScanApi(getKey(), EthNetwork.KOVAN, supplier);
         List<Block> blocks = api.account().minedBlocks("0x0010f94b296A852aAac52EA6c5Ac72e03afD032D");
         assertNotNull(blocks);
     }
diff --git a/src/test/java/io/api/etherscan/contract/ContractApiTest.java b/src/test/java/io/api/etherscan/contract/ContractApiTest.java
@@ -34,8 +34,8 @@ public void invalidParamWithError() {
 
     @Test
     public void correctParamWithEmptyExpectedResult() {
-        Abi abi = getApi().contract().contractAbi("0xBB1bc244D798123fDe783fCc1C72d3Bb8C189413");
+        Abi abi = getApi().contract().contractAbi("0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413");
         assertNotNull(abi);
-        assertFalse(abi.isVerified());
+        assertTrue(abi.isVerified());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ dependencies {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`test {`
	`46`	`+ failFast = true`
	`47`	`+`
`46`	`48`	`useJUnit()`
`47`	`49`	`testLogging {`
`48`	`50`	`events "passed", "skipped", "failed"`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public void invalidParamWithError() {`
`34`	`34`
`35`	`35`	`@Test`
`36`	`36`	`public void correctParamWithEmptyExpectedResult() {`
`37`		`- Abi abi = getApi().contract().contractAbi("0xBB1bc244D798123fDe783fCc1C72d3Bb8C189413");`
	`37`	`+ Abi abi = getApi().contract().contractAbi("0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413");`
`38`	`38`	`assertNotNull(abi);`
`39`		`- assertFalse(abi.isVerified());`
	`39`	`+ assertTrue(abi.isVerified());`
`40`	`40`	`}`
`41`	`41`	`}`