Skip to content

Commit

Permalink
Upgrade to Apache Tuweni 1.2.0 (hyperledger#1493)
Browse files Browse the repository at this point in the history 
* Upgrade to Apache Tuweni 1.2.0

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* no jsr305

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>

Co-authored-by: Danno Ferrin <danno.ferrin@gmail.com>
  • Loading branch information
@atoulme @shemnon
atoulme and shemnon authored Nov 5, 2020
1 parent 88b9c01 commit b9364ed
Show file tree
Hide file tree
Showing 31 changed files with 71 additions and 68 deletions.
6 changes: 3 additions & 3 deletions acceptance-tests/dsl/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:units'
implementation 'org.assertj:assertj-core'
implementation 'org.awaitility:awaitility'
implementation 'org.java-websocket:Java-WebSocket'
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/tests/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
testImplementation 'junit:junit'
testImplementation 'net.consensys:orion'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'org.apache.tuweni:tuweni-crypto'
testImplementation 'org.apache.tuweni:crypto'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.web3j:abi'
Expand Down
11 changes: 6 additions & 5 deletions besu/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ dependencies {
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-config'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:config'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.xerial.snappy:snappy-java'

Expand All @@ -80,8 +81,8 @@ dependencies {
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'junit:junit'
testImplementation 'org.apache.commons:commons-text'
testImplementation 'org.apache.tuweni:tuweni-bytes'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:bytes'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'
Expand Down
2 changes: 1 addition & 1 deletion config/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'info.picocli:picocli'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

testImplementation project(':testutil')
Expand Down
4 changes: 2 additions & 2 deletions consensus/clique/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
Expand Down
2 changes: 1 addition & 1 deletion consensus/common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'

testImplementation project(':crypto')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions consensus/ibft/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions consensus/ibftlegacy/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

testImplementation project(path: ':consensus:ibft', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions crypto/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'net.java.dev.jna:jna'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.hyperledger.besu:secp256k1'

runtimeOnly 'org.apache.logging.log4j:log4j-core'
Expand Down
3 changes: 2 additions & 1 deletion enclave/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ dependencies {
api project(':crypto')

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-net'
implementation 'org.apache.tuweni:net'
implementation 'org.apache.logging.log4j:log4j-api'

runtimeOnly('org.bouncycastle:bcpkix-jdk15on')
Expand Down
8 changes: 4 additions & 4 deletions ethereum/api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ dependencies {
implementation 'io.vertx:vertx-unit'
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-net'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:net'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.bouncycastle:bcprov-jdk15on'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.xerial.snappy:snappy-java'
Expand Down
4 changes: 2 additions & 2 deletions ethereum/blockcreation/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
Expand Down
10 changes: 5 additions & 5 deletions ethereum/core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'net.java.dev.jna:jna'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.hyperledger.besu:bls12-381'
implementation 'org.immutables:value-annotations'

Expand All @@ -60,9 +60,9 @@ dependencies {

testImplementation 'junit:junit'
testImplementation 'org.apache.logging.log4j:log4j-core'
testImplementation 'org.apache.tuweni:tuweni-bytes'
testImplementation 'org.apache.tuweni:tuweni-io'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:bytes'
testImplementation 'org.apache.tuweni:io'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'

Expand Down
4 changes: 2 additions & 2 deletions ethereum/eth/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

annotationProcessor "org.immutables:value"
implementation "org.immutables:value-annotations"
Expand Down
2 changes: 1 addition & 1 deletion ethereum/ethstats/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'

implementation project(':consensus:clique')
implementation project(':config')
Expand Down
2 changes: 1 addition & 1 deletion ethereum/mock-p2p/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
implementation project(':util')

implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'

testImplementation "junit:junit"
testImplementation 'org.assertj:assertj-core'
Expand Down
4 changes: 2 additions & 2 deletions ethereum/p2p/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation 'io.prometheus:simpleclient'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.xerial.snappy:snappy-java'

annotationProcessor "org.immutables:value"
Expand Down
6 changes: 3 additions & 3 deletions ethereum/permissioning/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.web3j:abi:5.0.0'

testImplementation project(':config')
Expand Down
1 change: 1 addition & 0 deletions ethereum/referencetests/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {
implementation project(':services:kvstore')

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'

testOutput sourceSets.test.output
}
Expand Down
4 changes: 2 additions & 2 deletions ethereum/retesteth/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
Expand Down
4 changes: 2 additions & 2 deletions ethereum/rlp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

jmh project(':util')

Expand Down
4 changes: 2 additions & 2 deletions ethereum/stratum/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

testImplementation project(':testutil')

Expand Down
4 changes: 2 additions & 2 deletions ethereum/trie/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ dependencies {
implementation project(':services:kvstore')

implementation 'com.google.guava:guava'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.bouncycastle:bcprov-jdk15on'

testImplementation project(':testutil')
testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput')

testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation 'junit:junit'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
}
Expand Down
14 changes: 7 additions & 7 deletions gradle/versions.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ dependencyManagement {
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
dependency 'org.fusesource.jansi:jansi:1.8'

dependency 'org.apache.tuweni:tuweni-bytes:1.1.0'
dependency 'org.apache.tuweni:tuweni-config:1.1.0'
dependency 'org.apache.tuweni:tuweni-crypto:1.1.0'
dependency 'org.apache.tuweni:tuweni-io:1.1.0'
dependency 'org.apache.tuweni:tuweni-toml:1.1.0'
dependency 'org.apache.tuweni:tuweni-units:1.1.0'
dependency 'org.apache.tuweni:tuweni-net:1.1.0'
dependency 'org.apache.tuweni:bytes:1.2.0'
dependency 'org.apache.tuweni:config:1.2.0'
dependency 'org.apache.tuweni:crypto:1.2.0'
dependency 'org.apache.tuweni:io:1.2.0'
dependency 'org.apache.tuweni:toml:1.2.0'
dependency 'org.apache.tuweni:units:1.2.0'
dependency 'org.apache.tuweni:net:1.2.0'

dependency 'org.assertj:assertj-core:3.16.1'

Expand Down
4 changes: 2 additions & 2 deletions plugin-api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jar {
}

dependencies {
api 'org.apache.tuweni:tuweni-bytes'
api 'org.apache.tuweni:tuweni-units'
api 'org.apache.tuweni:bytes'
api 'org.apache.tuweni:units'
}

configurations { testArtifacts }
Expand Down
2 changes: 1 addition & 1 deletion plugins/rocksdb/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
implementation 'info.picocli:picocli'
implementation 'io.prometheus:simpleclient'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.rocksdb:rocksdbjni'

runtimeOnly 'org.apache.logging.log4j:log4j-core'
Expand Down
6 changes: 3 additions & 3 deletions privacy-contracts/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
jar { enabled = true }
dependencies {
implementation 'net.consensys:orion'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:toml'
implementation 'org.web3j:abi'
implementation 'org.web3j:besu'
}
2 changes: 1 addition & 1 deletion services/kvstore/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.prometheus:simpleclient'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.rocksdb:rocksdbjni'

runtimeOnly 'org.apache.logging.log4j:log4j-core'
Expand Down
2 changes: 1 addition & 1 deletion services/tasks/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'

runtimeOnly 'org.apache.logging.log4j:log4j-core'

Expand Down
6 changes: 3 additions & 3 deletions testutil/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp'
implementation 'junit:junit'
implementation 'net.consensys:orion'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:toml'
implementation 'org.assertj:assertj-core'
implementation 'org.mockito:mockito-core'
implementation 'org.web3j:core'
Expand Down
4 changes: 2 additions & 2 deletions util/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'

runtimeOnly 'org.apache.logging.log4j:log4j-core'

Expand Down

0 comments on commit b9364ed

Please sign in to comment.