Skip to content

Commit 0766222

Browse files
authored
R3SOL-368 Straighten dependencies (#6366)
Remove unused dependencies and rejig a few classes to make the dependency graph of the ledger libs a lot flatter.
1 parent d478e11 commit 0766222

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

components/ledger/ledger-verification/test.bndrun

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
bnd.identity;id='slf4j.simple',\
4242
bnd.identity;id='org.liquibase.core',\
4343
bnd.identity;id='com.opencsv',\
44-
bnd.identity;id='net.corda.external-event-responses-impl'
44+
bnd.identity;id='net.corda.external-event-responses-impl',\
45+
bnd.identity;id='net.corda.membership-impl'
4546

4647
-runstartlevel: \
4748
order=sortbynameversion,\

libs/crypto/merkle-impl/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies {
1919
implementation "net.corda:corda-application"
2020
implementation "net.corda:corda-crypto"
2121
implementation project(':libs:crypto:cipher-suite')
22-
implementation project(":libs:crypto:cipher-suite-impl")
2322
implementation project(":libs:crypto:crypto-core")
2423
implementation project(':libs:sandbox-types')
2524

libs/ledger/ledger-common-data/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ dependencies {
2121

2222
api project(':libs:base-internal')
2323
implementation project(':libs:crypto:crypto-core')
24-
implementation project(':libs:flows:flow-api')
2524
implementation project(':libs:sandbox-types')
2625
implementation project(':libs:serialization:json-validator-lib')
2726
implementation project(':libs:serialization:serialization-amqp-api')
2827
implementation project(':libs:serialization:serialization-internal')
29-
implementation project(':libs:serialization:serialization-checkpoint-api')
3028
implementation project(':libs:utilities')
3129

3230
testImplementation project(':testing:test-serialization')

libs/ledger/ledger-utxo-data/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dependencies {
1717

1818
implementation project(':libs:crypto:crypto-core')
1919
implementation project(':libs:ledger:ledger-common-data')
20-
implementation project(':libs:membership:membership-common')
2120
implementation project(':libs:sandbox-types')
2221
implementation project(':libs:serialization:serialization-internal')
2322
implementation project(':libs:utilities')
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package net.corda.ledger.utxo.data.transaction
22

33
import net.corda.ledger.common.data.transaction.WireTransaction
4-
import net.corda.membership.lib.SignedGroupParameters
54
import net.corda.v5.base.annotations.CordaSerializable
65
import net.corda.v5.ledger.utxo.StateAndRef
6+
import net.corda.v5.membership.GroupParameters
77

88
@CordaSerializable
99
data class UtxoLedgerTransactionContainer(
1010
val wireTransaction: WireTransaction,
1111
val inputStateAndRefs: List<StateAndRef<*>>,
1212
val referenceStateAndRefs: List<StateAndRef<*>>,
13-
val groupParameters: SignedGroupParameters?
13+
val groupParameters: GroupParameters?
1414
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.ledger.utxo.data.groupparameters.serializer.amqp
1+
package net.corda.membership.lib.impl.serializer.amqp
22

33
import net.corda.crypto.core.DigitalSignatureWithKey
44
import net.corda.membership.lib.GroupParametersFactory

0 commit comments

Comments
 (0)