Commit 412f99b

committed

[1.1.1]

ProxyBlockApiTest self queue with longer timeout

1 parent 167edcd commit 412f99bCopy full SHA for 412f99b

File tree

3 files changed

+24

-14

lines changed

src/test/java/io/api
- ApiRunner.java
- etherscan
  - EtherScanApiTest.java
  - proxy
    - ProxyBlockApiTest.java

3 files changed

+24

-14

lines changed

`‎src/test/java/io/api/ApiRunner.java‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,23 +11,23 @@ public class ApiRunner extends Assert {`
`11`	`11`	`private static final EtherScanApi apiRopsten;`
`12`	`12`	`private static final EtherScanApi apiRinkeby;`
`13`	`13`	`private static final EtherScanApi apiKovan;`
`14`		`- private static final String key;`
	`14`	`+ private static final String apiKey;`
`15`	`15`
`16`	`16`	`static {`
`17`		`- final String apiKey = System.getenv("API_KEY");`
`18`		`- key = (apiKey == null \|\| apiKey.isEmpty())`
	`17`	`+ final String key = System.getenv("API_KEY");`
	`18`	`+ apiKey = (key == null \|\| key.isEmpty())`
`19`	`19`	`? EtherScanApi.DEFAULT_KEY`
`20`		`- : apiKey;`
	`20`	`+ : key;`
`21`	`21`
`22`	`22`	`final QueueManager queueManager = new QueueManager(2, 2100L, 2100L, 0);`
`23`		`- api = new EtherScanApi(key, EthNetwork.MAINNET, queueManager);`
`24`		`- apiKovan = new EtherScanApi(key, EthNetwork.KOVAN, queueManager);`
`25`		`- apiRopsten = new EtherScanApi(key, EthNetwork.ROPSTEN, queueManager);`
`26`		`- apiRinkeby = new EtherScanApi(key, EthNetwork.RINKEBY, queueManager);`
	`23`	`+ api = new EtherScanApi(ApiRunner.apiKey, EthNetwork.MAINNET, queueManager);`
	`24`	`+ apiKovan = new EtherScanApi(ApiRunner.apiKey, EthNetwork.KOVAN, queueManager);`
	`25`	`+ apiRopsten = new EtherScanApi(ApiRunner.apiKey, EthNetwork.ROPSTEN, queueManager);`
	`26`	`+ apiRinkeby = new EtherScanApi(ApiRunner.apiKey, EthNetwork.RINKEBY, queueManager);`
`27`	`27`	`}`
`28`	`28`
`29`		`- public static String getKey() {`
`30`		`- return key;`
	`29`	`+ public static String getApiKey() {`
	`30`	`+ return apiKey;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public static EtherScanApi getApi() {`

`‎src/test/java/io/api/etherscan/EtherScanApiTest.java‎`

Lines changed: 1 addition & 1 deletion

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`	`}`

`‎src/test/java/io/api/etherscan/proxy/ProxyBlockApiTest.java‎`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`package io.api.etherscan.proxy;`
`2`	`2`
`3`	`3`	`import io.api.ApiRunner;`
	`4`	`+import io.api.etherscan.core.impl.EtherScanApi;`
	`5`	`+import io.api.etherscan.manager.impl.QueueManager;`
	`6`	`+import io.api.etherscan.model.EthNetwork;`
`4`	`7`	`import io.api.etherscan.model.proxy.BlockProxy;`
`5`	`8`	`import org.junit.Test;`
`6`	`9`
`@@ -14,9 +17,16 @@`
`14`	`17`	`*/`
`15`	`18`	`public class ProxyBlockApiTest extends ApiRunner {`
`16`	`19`
	`20`	`+ private final EtherScanApi api;`
	`21`	`+`
	`22`	`+ public ProxyBlockApiTest() {`
	`23`	`+ final QueueManager queueManager = new QueueManager(1, 5100L, 5100L, 0);`
	`24`	`+ this.api = new EtherScanApi(getApiKey(), EthNetwork.MAINNET, queueManager);`
	`25`	`+ }`
	`26`	`+`
`17`	`27`	`@Test`
`18`	`28`	`public void correct() {`
`19`		`- Optional<BlockProxy> block = getApi().proxy().block(5120);`
	`29`	`+ Optional<BlockProxy> block = api.proxy().block(5120);`
`20`	`30`	`assertTrue(block.isPresent());`
`21`	`31`	`BlockProxy proxy = block.get();`
`22`	`32`	`assertNotNull(proxy.getHash());`
`@@ -49,13 +59,13 @@ public void correct() {`
`49`	`59`
`50`	`60`	`@Test`
`51`	`61`	`public void correctParamWithEmptyExpectedResult() {`
`52`		`- Optional<BlockProxy> block = getApi().proxy().block(99999999999L);`
	`62`	`+ Optional<BlockProxy> block = api.proxy().block(99999999999L);`
`53`	`63`	`assertFalse(block.isPresent());`
`54`	`64`	`}`
`55`	`65`
`56`	`66`	`@Test`
`57`	`67`	`public void correctParamNegativeNo() {`
`58`		`- Optional<BlockProxy> block = getApi().proxy().block(-1);`
	`68`	`+ Optional<BlockProxy> block = api.proxy().block(-1);`
`59`	`69`	`assertTrue(block.isPresent());`
`60`	`70`	`assertNotNull(block.get().getHash());`
`61`	`71`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 412f99b

File tree

3 files changed

3 files changed

`‎src/test/java/io/api/ApiRunner.java‎`

`‎src/test/java/io/api/etherscan/EtherScanApiTest.java‎`

`‎src/test/java/io/api/etherscan/proxy/ProxyBlockApiTest.java‎`

0 commit comments