Merge branch 'develop' into 06516-flatten-build-event-handlers

hashgraph · May 11, 2023 · 5924a38 · 5924a38
2 parents 2279708 + d4c3217
commit 5924a38
Show file tree

Hide file tree

Showing 293 changed files with 3,578 additions and 2,987 deletions.
diff --git a/...ice-impl/src/main/java/com/hedera/node/app/service/admin/impl/handlers/AdminHandlers.java b/...ice-impl/src/main/java/com/hedera/node/app/service/admin/impl/handlers/AdminHandlers.java
diff --git a/...admin-service-impl/src/main/java/com/hedera/node/app/service/admin/impl/package-info.java b/...admin-service-impl/src/main/java/com/hedera/node/app/service/admin/impl/package-info.java
diff --git a/hedera-node/hedera-admin-service-impl/src/main/java/module-info.java b/hedera-node/hedera-admin-service-impl/src/main/java/module-info.java
diff --git a/...de/hedera-admin-service/src/main/java/com/hedera/node/app/service/admin/package-info.java b/...de/hedera-admin-service/src/main/java/com/hedera/node/app/service/admin/package-info.java
diff --git a/hedera-node/hedera-admin-service/src/main/java/module-info.java b/hedera-node/hedera-admin-service/src/main/java/module-info.java
diff --git a/...node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/config/GlobalDynamicConfig.java b/...node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/config/GlobalDynamicConfig.java
diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/config/NodeConfig.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/config/NodeConfig.java
diff --git a/hedera-node/hedera-app-spi/src/main/java/module-info.java b/hedera-node/hedera-app-spi/src/main/java/module-info.java
@@ -12,10 +12,7 @@
     exports com.hedera.node.app.spi.meta;
     exports com.hedera.node.app.spi.numbers;
     exports com.hedera.node.app.spi.workflows;
-    exports com.hedera.node.app.spi.config;
     exports com.hedera.node.app.spi.records;
     exports com.hedera.node.app.spi.validation;
     exports com.hedera.node.app.spi.info;
-    exports com.hedera.node.app.spi.config.converter;
-    exports com.hedera.node.app.spi.config.types;
 }
diff --git a/hedera-node/hedera-app/build.gradle.kts b/hedera-node/hedera-app/build.gradle.kts
@@ -34,13 +34,13 @@ dependencies {
   annotationProcessor(libs.dagger.compiler)
 
   implementation(project(":hedera-node:hedera-app-spi"))
+  implementation(project(":hedera-node:hedera-config"))
   implementation(project(":hedera-node:hedera-mono-service"))
   implementation(project(":hedera-node:hapi-utils"))
   implementation(project(":hedera-node:hapi-fees"))
-  implementation(project(":hedera-node:hedera-admin-service-impl"))
+  implementation(project(":hedera-node:hedera-networkadmin-service-impl"))
   implementation(project(":hedera-node:hedera-consensus-service-impl"))
   implementation(project(":hedera-node:hedera-file-service-impl"))
-  implementation(project(":hedera-node:hedera-network-service-impl"))
   implementation(project(":hedera-node:hedera-schedule-service-impl"))
   implementation(project(":hedera-node:hedera-smart-contract-service-impl"))
   implementation(project(":hedera-node:hedera-token-service-impl"))
@@ -62,6 +62,7 @@ dependencies {
   itestImplementation(testLibs.bundles.mockito)
   itestCompileOnly(libs.spotbugs.annotations)
 
+  testImplementation(testFixtures(project(":hedera-node:hedera-config")))
   testImplementation(testFixtures(project(":hedera-node:hedera-mono-service")))
   testImplementation(testFixtures(project(":hedera-node:hedera-app-spi")))
   testImplementation(testLibs.classgraph)