Skip to content

Commit

Permalink
Merge pull request #2093 from hyperledger/bump_4.12.2_snapshot
Browse files Browse the repository at this point in the history
Bump 4.12.2 snapshot
  • Loading branch information
gtebrean authored Aug 15, 2024
2 parents fb74fa0 + 1580f10 commit f27b4fe
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 22 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.12.1]() (Upcoming)
# [4.12.2]() (Upcoming)

### Bug Fixes

*

### Features

* bump snapshot version to 4.12.2 [#2093](https://github.com/hyperledger/web3j/pull/2093)

### BREAKING CHANGES

*

# [4.12.1](https://github.com/hyperledger/web3j/releases/tag/v4.12.1) (2024-08-14)

### Bug Fixes

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Java:
<dependency>
<groupId>org.web3j</groupId>
<artifactId>core</artifactId>
<version>4.12.0</version>
<version>4.12.1</version>
</dependency>
```

Expand All @@ -141,7 +141,7 @@ Gradle
Java:

```groovy
implementation ('org.web3j:core:4.12.0')
implementation ('org.web3j:core:4.12.1')
```

Android:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ext {
// test dependencies
equalsverifierVersion = '3.16.1'
junitVersion = '5.5.2'
web3jUnitVersion = '4.12.0'
web3jUnitVersion = '4.12.1'
junitBenchmarkVersion = '0.7.2'
logbackVersion = '1.5.6'
mockitoJunitVersion = '3.1.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=org.web3j
version=4.12.1-SNAPSHOT
version=4.12.2-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@
*/
package org.web3j.protocol.scenarios;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;

import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import org.web3j.EVMTest;
import org.web3j.NodeType;
import org.web3j.protocol.Web3j;
Expand All @@ -27,16 +38,6 @@
import org.web3j.tx.response.QueuingTransactionReceiptProcessor;
import org.web3j.utils.Convert;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;

import static org.junit.jupiter.api.Assertions.*;
import static org.web3j.tx.TransactionManager.DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH;

Expand Down Expand Up @@ -74,11 +75,11 @@ public void testTransactionPolling() throws Exception {
}

for (int i = 0;
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !transactionReceipts.isEmpty();
i++) {
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !transactionReceipts.isEmpty();
i++) {

for (Iterator<Future<TransactionReceipt>> iterator = transactionReceipts.iterator();
iterator.hasNext(); ) {
iterator.hasNext(); ) {
Future<TransactionReceipt> transactionReceiptFuture = iterator.next();

if (transactionReceiptFuture.isDone()) {
Expand Down Expand Up @@ -140,8 +141,7 @@ public void accept(TransactionReceipt transactionReceipt) {
}

@Override
public void exception(Exception exception) {
}
public void exception(Exception exception) {}
},
DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH,
POLLING_FREQUENCY));
Expand All @@ -156,8 +156,8 @@ public void exception(Exception exception) {
}

for (int i = 0;
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !pendingTransactions.isEmpty();
i++) {
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !pendingTransactions.isEmpty();
i++) {
for (TransactionReceipt transactionReceipt : transactionReceipts) {
assertFalse(transactionReceipt.getBlockHash().isEmpty());
pendingTransactions.remove(transactionReceipt.getTransactionHash());
Expand Down

0 comments on commit f27b4fe

Please sign in to comment.