Skip to content

Commit ed8b0e1

Browse files
williamvigorr3jennyang-r3
williamvigorr3
and
jennyang-r3
authoredNov 27, 2024··
R3SOL-534 Extract filtered transaction (#6403)
Extract filtered transactions into the ledger library. --------- Co-authored-by: Jenny Yang <eunjee.yang@r3.com>
1 parent 98bddae commit ed8b0e1

File tree

21 files changed

+86
-58
lines changed

21 files changed

+86
-58
lines changed
 

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/UtxoLedgerServiceImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInte
99
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoTransactionBuilderImpl
1010
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoTransactionBuilderInternal
1111
import net.corda.ledger.lib.utxo.flow.impl.transaction.factory.UtxoSignedTransactionFactory
12+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
13+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
1214
import net.corda.ledger.lib.utxo.flow.impl.transaction.verifier.UtxoLedgerTransactionVerificationService
1315
import net.corda.ledger.lib.utxo.flow.impl.transaction.verifier.UtxoSignedTransactionWithDependencies
1416
import net.corda.ledger.utxo.flow.impl.flows.finality.UtxoFinalityFlow
@@ -22,8 +24,6 @@ import net.corda.ledger.utxo.flow.impl.flows.transactiontransmission.SendWireTra
2224
import net.corda.ledger.utxo.flow.impl.notary.PluggableNotaryService
2325
import net.corda.ledger.utxo.flow.impl.persistence.UtxoLedgerPersistenceService
2426
import net.corda.ledger.utxo.flow.impl.persistence.VaultNamedParameterizedQueryImpl
25-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
26-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
2727
import net.corda.ledger.utxo.flow.impl.transaction.verifier.UtxoBaselinedTransactionBuilder
2828
import net.corda.sandbox.type.UsedByFlow
2929
import net.corda.sandboxgroupcontext.CurrentSandboxGroupContext

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/persistence/UtxoLedgerPersistenceServiceImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedLedgerTransacti
1313
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
1414
import net.corda.ledger.lib.utxo.flow.impl.transaction.factory.UtxoLedgerTransactionFactory
1515
import net.corda.ledger.lib.utxo.flow.impl.transaction.factory.UtxoSignedTransactionFactory
16+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
17+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
1618
import net.corda.ledger.lib.utxo.flow.impl.transaction.verifier.UtxoSignedLedgerTransactionImpl
1719
import net.corda.ledger.utxo.data.transaction.SignedLedgerTransactionContainer
1820
import net.corda.ledger.utxo.data.transaction.UtxoFilteredTransactionAndSignaturesImpl
@@ -47,8 +49,6 @@ import net.corda.ledger.utxo.flow.impl.persistence.external.events.PersistTransa
4749
import net.corda.ledger.utxo.flow.impl.persistence.external.events.PersistTransactionSignaturesParameters
4850
import net.corda.ledger.utxo.flow.impl.persistence.external.events.UpdateTransactionStatusExternalEventFactory
4951
import net.corda.ledger.utxo.flow.impl.persistence.external.events.UpdateTransactionStatusParameters
50-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
51-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
5252
import net.corda.metrics.CordaMetrics
5353
import net.corda.sandbox.type.SandboxConstants.CORDA_SYSTEM_SERVICE
5454
import net.corda.sandbox.type.UsedByFlow

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactoryOsgiImpl.kt

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package net.corda.ledger.utxo.flow.impl.transaction.filtered.factory
2+
3+
import net.corda.ledger.common.data.transaction.filtered.factory.FilteredTransactionFactory
4+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
5+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactoryImpl
6+
import net.corda.sandbox.type.SandboxConstants
7+
import net.corda.sandbox.type.UsedByFlow
8+
import net.corda.v5.application.serialization.SerializationService
9+
import org.osgi.service.component.annotations.Activate
10+
import org.osgi.service.component.annotations.Component
11+
import org.osgi.service.component.annotations.Reference
12+
import org.osgi.service.component.annotations.ServiceScope
13+
14+
@Component(
15+
service = [UtxoFilteredTransactionFactory::class, UsedByFlow::class],
16+
property = [SandboxConstants.CORDA_UNINJECTABLE_SERVICE],
17+
scope = ServiceScope.PROTOTYPE
18+
)
19+
class UtxoFilteredTransactionFactoryOsgiImpl(
20+
delegate: UtxoFilteredTransactionFactory
21+
) : UtxoFilteredTransactionFactory by delegate, UsedByFlow {
22+
@Activate
23+
constructor(
24+
@Reference(service = FilteredTransactionFactory::class)
25+
filteredTransactionFactory: FilteredTransactionFactory,
26+
@Reference(service = SerializationService::class)
27+
serializationService: SerializationService
28+
) : this(UtxoFilteredTransactionFactoryImpl(filteredTransactionFactory, serializationService))
29+
}

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/serializer/amqp/UtxoFilteredTransactionBuilderSerializer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp
22

3-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
3+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
44
import net.corda.sandbox.type.SandboxConstants.CORDA_UNINJECTABLE_SERVICE
55
import net.corda.sandbox.type.UsedByFlow
66
import net.corda.serialization.BaseProxySerializer

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/serializer/amqp/UtxoFilteredTransactionSerializer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp
22

33
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
4-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
4+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
55
import net.corda.sandbox.type.SandboxConstants.CORDA_UNINJECTABLE_SERVICE
66
import net.corda.sandbox.type.UsedByFlow
77
import net.corda.sandbox.type.UsedByVerification

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/persistence/UtxoLedgerPersistenceServiceImplTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionImpl
1818
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
1919
import net.corda.ledger.lib.utxo.flow.impl.transaction.factory.UtxoLedgerTransactionFactory
2020
import net.corda.ledger.lib.utxo.flow.impl.transaction.factory.UtxoSignedTransactionFactory
21+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
22+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
2123
import net.corda.ledger.lib.utxo.flow.impl.transaction.verifier.NotarySignatureVerificationServiceInternal
2224
import net.corda.ledger.lib.utxo.flow.impl.transaction.verifier.UtxoSignedLedgerTransactionImpl
2325
import net.corda.ledger.utxo.data.transaction.SignedLedgerTransactionContainer
@@ -36,8 +38,6 @@ import net.corda.ledger.utxo.flow.impl.persistence.external.events.FindTransacti
3638
import net.corda.ledger.utxo.flow.impl.persistence.external.events.PersistFilteredTransactionsExternalEventFactory
3739
import net.corda.ledger.utxo.flow.impl.persistence.external.events.PersistTransactionExternalEventFactory
3840
import net.corda.ledger.utxo.flow.impl.persistence.external.events.PersistTransactionIfDoesNotExistExternalEventFactory
39-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
40-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
4141
import net.corda.ledger.utxo.testkit.notaryX500Name
4242
import net.corda.sandboxgroupcontext.CurrentSandboxGroupContext
4343
import net.corda.sandboxgroupcontext.SandboxGroupContext

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/serializer/amqp/UtxoFilteredTransactionBuilderSerializerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp
22

3-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
3+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
44
import net.corda.v5.base.exceptions.CordaRuntimeException
55
import org.assertj.core.api.Assertions.assertThatThrownBy
66
import org.junit.jupiter.api.Test

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/serializer/amqp/UtxoFilteredTransactionSerializerTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp
22

33
import net.corda.internal.serialization.amqp.helper.TestSerializationService
44
import net.corda.ledger.common.data.transaction.filtered.serializer.amqp.FilteredTransactionSerializer
5-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
6-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionTestBase
5+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
6+
import net.corda.ledger.utxo.test.UtxoFilteredTransactionTestBase
77
import net.corda.ledger.utxo.test.UtxoLedgerTest
88
import net.corda.utilities.serialization.deserialize
99
import net.corda.v5.ledger.utxo.transaction.filtered.UtxoFilteredTransaction

‎libs/ledger-lib-utxo-flow/src/main/java/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/factory/package-info.java

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@Export
2+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory;
3+
4+
import org.osgi.annotation.bundle.Export;

‎libs/ledger-lib-utxo-flow/src/main/java/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/package-info.java

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@Export
2+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered;
3+
4+
import org.osgi.annotation.bundle.Export;

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderImpl.kt ‎libs/ledger-lib-utxo-flow/src/main/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered
22

33
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters
44
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
55
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
6+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
67
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup
7-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactory
88
import net.corda.v5.base.annotations.Suspendable
99
import net.corda.v5.ledger.utxo.Command
1010
import net.corda.v5.ledger.utxo.ContractState

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderInternal.kt ‎libs/ledger-lib-utxo-flow/src/main/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderInternal.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered
22

33
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters
44
import net.corda.v5.ledger.utxo.transaction.filtered.UtxoFilteredTransactionBuilder

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionImpl.kt ‎libs/ledger-lib-utxo-flow/src/main/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionImpl.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered
22

33
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
44
import net.corda.ledger.utxo.data.state.StateAndRefImpl
@@ -7,7 +7,6 @@ import net.corda.ledger.utxo.data.state.getEncumbranceGroup
77
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup
88
import net.corda.ledger.utxo.data.transaction.UtxoOutputInfoComponent
99
import net.corda.ledger.utxo.data.transaction.WrappedUtxoWireTransaction
10-
import net.corda.utilities.serialization.deserialize
1110
import net.corda.v5.application.serialization.SerializationService
1211
import net.corda.v5.base.types.MemberX500Name
1312
import net.corda.v5.crypto.SecureHash
@@ -152,10 +151,10 @@ class UtxoFilteredTransactionImpl(
152151
) {
153152
FilteredDataAuditImpl(0, emptyMap())
154153
} else {
155-
FilteredDataAuditImpl(
154+
FilteredDataAuditImpl<T>(
156155
group.merkleProof.treeSize,
157156
group.merkleProof.leaves.associateBy({ leaf -> leaf.index }, { leaf ->
158-
serializationService.deserialize(leaf.leafData)
157+
serializationService.deserialize(leaf.leafData, T::class.java)
159158
})
160159
)
161160
}

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactory.kt ‎libs/ledger-lib-utxo-flow/src/main/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactory.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered.factory
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory
22

33
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
44
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
5-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
5+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
66
import net.corda.v5.base.annotations.Suspendable
77
import net.corda.v5.ledger.utxo.transaction.filtered.UtxoFilteredTransaction
88
import net.corda.v5.ledger.utxo.transaction.filtered.UtxoFilteredTransactionBuilder

‎components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactoryImpl.kt ‎libs/ledger-lib-utxo-flow/src/main/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactoryImpl.kt

+5-18
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered.factory
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory
22

33
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters
44
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
55
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
66
import net.corda.ledger.common.data.transaction.filtered.factory.FilteredTransactionFactory
77
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
8+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
9+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
810
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup
911
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup.METADATA
1012
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup.NOTARY
1113
import net.corda.ledger.utxo.data.transaction.UtxoOutputInfoComponent
12-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
13-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
14-
import net.corda.sandbox.type.SandboxConstants
15-
import net.corda.sandbox.type.UsedByFlow
1614
import net.corda.v5.application.serialization.SerializationService
1715
import net.corda.v5.base.annotations.Suspendable
1816
import net.corda.v5.base.types.MemberX500Name
1917
import net.corda.v5.ledger.common.transaction.TransactionMetadata
2018
import net.corda.v5.ledger.utxo.TimeWindow
2119
import net.corda.v5.ledger.utxo.transaction.filtered.UtxoFilteredTransaction
22-
import org.osgi.service.component.annotations.Activate
23-
import org.osgi.service.component.annotations.Component
24-
import org.osgi.service.component.annotations.Reference
25-
import org.osgi.service.component.annotations.ServiceScope
2620
import java.security.PublicKey
2721

28-
@Component(
29-
service = [UtxoFilteredTransactionFactory::class, UsedByFlow::class],
30-
property = [SandboxConstants.CORDA_UNINJECTABLE_SERVICE],
31-
scope = ServiceScope.PROTOTYPE
32-
)
33-
class UtxoFilteredTransactionFactoryImpl @Activate constructor(
34-
@Reference(service = FilteredTransactionFactory::class)
22+
class UtxoFilteredTransactionFactoryImpl(
3523
private val filteredTransactionFactory: FilteredTransactionFactory,
36-
@Reference(service = SerializationService::class)
3724
private val serializationService: SerializationService
38-
) : UtxoFilteredTransactionFactory, UsedByFlow {
25+
) : UtxoFilteredTransactionFactory {
3926

4027
@Suspendable
4128
override fun create(

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderImplTest.kt ‎libs/ledger-lib-utxo-flow/src/test/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionBuilderImplTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered
22

33
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters.AuditProof
44
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionImplTest.kt ‎libs/ledger-lib-utxo-flow/src/test/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionImplTest.kt

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered
22

33
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
44
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters
55
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
66
import net.corda.ledger.common.testkit.publicKeyExample
77
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup
88
import net.corda.ledger.utxo.data.transaction.UtxoOutputInfoComponent
9+
import net.corda.ledger.utxo.test.OutputState1
10+
import net.corda.ledger.utxo.test.OutputState2
11+
import net.corda.ledger.utxo.test.UtxoFilteredTransactionTestBase
912
import net.corda.v5.base.types.MemberX500Name
1013
import net.corda.v5.ledger.utxo.ContractState
1114
import net.corda.v5.ledger.utxo.StateAndRef
@@ -254,15 +257,3 @@ class UtxoFilteredTransactionImplTest : UtxoFilteredTransactionTestBase() {
254257
.isInstanceOf(UtxoFilteredData.Removed::class.java)
255258
}
256259
}
257-
258-
class OutputState1 : ContractState {
259-
override fun getParticipants(): MutableList<PublicKey> {
260-
TODO("Not yet implemented")
261-
}
262-
}
263-
264-
class OutputState2 : ContractState {
265-
override fun getParticipants(): MutableList<PublicKey> {
266-
TODO("Not yet implemented")
267-
}
268-
}

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactoryImplTest.kt ‎libs/ledger-lib-utxo-flow/src/test/kotlin/net/corda/ledger/lib/utxo/flow/impl/transaction/filtered/factory/UtxoFilteredTransactionFactoryImplTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered.factory
1+
package net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.factory
22

33
import net.corda.ledger.common.data.transaction.filtered.ComponentGroupFilterParameters
44
import net.corda.ledger.common.data.transaction.filtered.factory.FilteredTransactionFactory
55
import net.corda.ledger.common.testkit.publicKeyExample
66
import net.corda.ledger.lib.utxo.flow.impl.timewindow.TimeWindowBetweenImpl
77
import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoSignedTransactionInternal
8+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
9+
import net.corda.ledger.lib.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
810
import net.corda.ledger.utxo.data.transaction.UtxoComponentGroup
9-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderImpl
10-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionBuilderInternal
1111
import net.corda.ledger.utxo.test.UtxoLedgerTest
1212
import net.corda.ledger.utxo.testkit.notaryX500Name
1313
import net.corda.ledger.utxo.testkit.utxoTimeWindowExample

‎testing/ledger/ledger-utxo-base-test/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies {
1111
api project(':testing:ledger:ledger-utxo-testkit')
1212

1313
implementation project(':libs:ledger:ledger-utxo-transaction-verifier')
14+
implementation project(':libs:ledger:ledger-utxo-data')
1415
implementation project(':components:ledger:ledger-utxo-flow')
1516
implementation project(':libs:ledger-lib-utxo-flow')
1617
implementation project(':libs:membership:membership-common')

‎components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionTestBase.kt ‎testing/ledger/ledger-utxo-base-test/src/main/kotlin/net/corda/ledger/utxo/test/UtxoFilteredTransactionTestBase.kt

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.ledger.utxo.flow.impl.transaction.filtered
1+
package net.corda.ledger.utxo.test
22

33
import net.corda.application.impl.services.json.JsonMarshallingServiceImpl
44
import net.corda.cipher.suite.impl.CipherSchemeMetadataImpl
@@ -152,3 +152,16 @@ open class UtxoFilteredTransactionTestBase {
152152
)
153153
}
154154
}
155+
156+
157+
class OutputState1 : ContractState {
158+
override fun getParticipants(): MutableList<PublicKey> {
159+
TODO("Not yet implemented")
160+
}
161+
}
162+
163+
class OutputState2 : ContractState {
164+
override fun getParticipants(): MutableList<PublicKey> {
165+
TODO("Not yet implemented")
166+
}
167+
}

‎testing/ledger/ledger-utxo-base-test/src/main/kotlin/net/corda/ledger/utxo/test/UtxoLedgerTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import net.corda.ledger.lib.utxo.flow.impl.transaction.UtxoTransactionBuilderImp
1919
import net.corda.ledger.utxo.flow.impl.persistence.UtxoLedgerGroupParametersPersistenceService
2020
import net.corda.ledger.utxo.flow.impl.transaction.factory.impl.UtxoLedgerTransactionFactoryOsgiImpl
2121
import net.corda.ledger.utxo.flow.impl.transaction.factory.impl.UtxoSignedTransactionFactoryOsgiImpl
22-
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactoryImpl
22+
import net.corda.ledger.utxo.flow.impl.transaction.filtered.factory.UtxoFilteredTransactionFactoryOsgiImpl
2323
import net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp.UtxoSignedTransactionSerializer
2424
import net.corda.ledger.utxo.flow.impl.transaction.serializer.kryo.UtxoSignedTransactionKryoSerializer
2525
import net.corda.ledger.utxo.testkit.anotherNotaryX500Name
@@ -62,7 +62,7 @@ abstract class UtxoLedgerTest : CommonLedgerTest() {
6262

6363
val mockPluggableNotaryService = mock<PluggableNotaryService>()
6464

65-
private val utxoFilteredTransactionFactory = UtxoFilteredTransactionFactoryImpl(
65+
private val utxoFilteredTransactionFactory = UtxoFilteredTransactionFactoryOsgiImpl(
6666
FilteredTransactionFactoryImpl(
6767
jsonMarshallingService,
6868
jsonValidator,

0 commit comments

Comments
 (0)
Please sign in to comment.