From d2968509ba6d69732b3e8897902d705d68cf62f2 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 15 Aug 2022 21:24:09 -0600 Subject: [PATCH] Simplify Trie Dependencies (#4259) Make the ethereum/trie and services/kvstore modules as slim as possible by dropping dependencies. * The ':util' api dependency is removed from kvstore and added to eth module * Move tries's kvstore dependency to test * Other dependencies are removed as unused from trie and kvstore Signed-off-by: Danno Ferrin --- ethereum/eth/build.gradle | 1 + ethereum/trie/build.gradle | 4 ++-- plugins/rocksdb/build.gradle | 1 + services/kvstore/build.gradle | 12 ------------ 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle index 1033df5a4..89544c439 100644 --- a/ethereum/eth/build.gradle +++ b/ethereum/eth/build.gradle @@ -35,6 +35,7 @@ task testJar(type: Jar) { dependencies { api 'org.slf4j:slf4j-api' + api project(':util') annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess' implementation project(':config') diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle index 5bf23f0e4..e3e232edb 100644 --- a/ethereum/trie/build.gradle +++ b/ethereum/trie/build.gradle @@ -30,16 +30,16 @@ jar { dependencies { implementation project(':crypto') implementation project(':ethereum:rlp') - implementation project(':services:kvstore') + implementation "org.immutables:value-annotations" implementation 'com.google.guava:guava' implementation 'io.opentelemetry:opentelemetry-api' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.bouncycastle:bcprov-jdk15on' annotationProcessor "org.immutables:value" - implementation "org.immutables:value-annotations" + testImplementation project(':services:kvstore') testImplementation project(':testutil') testImplementation 'com.fasterxml.jackson.core:jackson-databind' diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle index 70c28080e..3e94af4bf 100644 --- a/plugins/rocksdb/build.gradle +++ b/plugins/rocksdb/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation project(':metrics:core') implementation project(':metrics:rocksdb') implementation project(':services:kvstore') + implementation project(':util') implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.guava:guava' diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle index 294d5cc6d..d68f72680 100644 --- a/services/kvstore/build.gradle +++ b/services/kvstore/build.gradle @@ -29,23 +29,11 @@ jar { dependencies { api project(':plugin-api') - api project(':util') api 'org.slf4j:slf4j-api' - implementation project(':metrics:core') - implementation project(':metrics:rocksdb') - - implementation 'com.google.guava:guava' - implementation 'io.prometheus:simpleclient' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.rocksdb:rocksdbjni' - testImplementation project(':testutil') - testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' - testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.mockito:mockito-core' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' }