Skip to content

Commit

Permalink
CORE-18698: move FilteredTransaction interface and its data classes t…
Browse files Browse the repository at this point in the history 
…o ledger-common-flow (#5526)

In prepration for using FilteredTransaciton from UtxoLedgerService move the interface and add a stub.

Refactoring broken out from #5485.
  • Loading branch information
@dickon
dickon authored Jan 26, 2024
1 parent bded0af commit 0a02bf9
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion ...t/corda/ledger/common/flow/transaction/filtered/factory/ComponentGroupFilterParameters.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.corda.ledger.common.flow.transaction.filtered.factory

import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.v5.crypto.merkle.MerkleProof
import net.corda.v5.crypto.merkle.MerkleProofType
import java.util.function.Predicate
Expand Down
2 changes: 1 addition & 1 deletion ...n/net/corda/ledger/common/flow/transaction/filtered/factory/FilteredTransactionFactory.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.corda.ledger.common.flow.transaction.filtered.factory

import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.v5.base.annotations.Suspendable
import java.util.function.Predicate

Expand Down
4 changes: 2 additions & 2 deletions .../kotlin/net/corda/ledger/common/flow/impl/transaction/filtered/FilteredTransactionImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import net.corda.ledger.common.data.transaction.ROOT_MERKLE_TREE_DIGEST_OPTIONS_
import net.corda.ledger.common.data.transaction.ROOT_MERKLE_TREE_DIGEST_OPTIONS_NODE_PREFIX_B64_KEY
import net.corda.ledger.common.data.transaction.ROOT_MERKLE_TREE_DIGEST_PROVIDER_NAME_KEY
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
import net.corda.ledger.common.flow.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransactionVerificationException
import net.corda.v5.application.marshalling.JsonMarshallingService
import net.corda.v5.crypto.DigestAlgorithmName
Expand Down
4 changes: 2 additions & 2 deletions ...da/ledger/common/flow/impl/transaction/filtered/factory/FilteredTransactionFactoryImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package net.corda.ledger.common.flow.impl.transaction.filtered.factory

import net.corda.crypto.cipher.suite.merkle.MerkleTreeProvider
import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.impl.transaction.filtered.FilteredTransactionImpl
import net.corda.ledger.common.flow.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters.AuditProof
import net.corda.ledger.common.flow.transaction.filtered.factory.FilteredTransactionFactory
Expand Down
4 changes: 2 additions & 2 deletions ...er/common/flow/impl/transaction/filtered/serializer/amqp/FilteredTransactionSerializer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.corda.ledger.common.flow.impl.transaction.filtered.serializer.amqp

import net.corda.crypto.cipher.suite.merkle.MerkleTreeProvider
import net.corda.ledger.common.data.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.impl.transaction.filtered.FilteredTransactionImpl
import net.corda.ledger.common.flow.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.sandbox.type.SandboxConstants.CORDA_UNINJECTABLE_SERVICE
import net.corda.sandbox.type.UsedByFlow
import net.corda.sandbox.type.UsedByVerification
Expand Down
2 changes: 1 addition & 1 deletion ...da/ledger/common/flow/impl/transaction/filtered/FilteredTransactionImplIntegrationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import net.corda.common.json.validation.impl.JsonValidatorImpl
import net.corda.crypto.merkle.impl.MerkleTreeProviderImpl
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.impl.transaction.filtered.factory.FilteredTransactionFactoryImpl
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
import net.corda.ledger.common.testkit.getWireTransactionExample
Expand Down
4 changes: 2 additions & 2 deletions ...lin/net/corda/ledger/common/flow/impl/transaction/filtered/FilteredTransactionImplTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import net.corda.crypto.merkle.impl.MerkleTreeProviderImpl
import net.corda.crypto.merkle.impl.NonceHashDigestProvider
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
import net.corda.ledger.common.data.transaction.WireTransactionDigestSettings
import net.corda.ledger.common.flow.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredComponentGroup
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransactionVerificationException
import net.corda.v5.application.marshalling.JsonMarshallingService
import net.corda.v5.crypto.DigestAlgorithmName
Expand Down
2 changes: 1 addition & 1 deletion ...edger/common/flow/impl/transaction/filtered/factory/FilteredTransactionFactoryImplTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import net.corda.common.json.validation.impl.JsonValidatorImpl
import net.corda.crypto.merkle.impl.MerkleTreeProviderImpl
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
import net.corda.ledger.common.testkit.getWireTransactionExample
Expand Down
2 changes: 1 addition & 1 deletion ...otlin/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionImpl.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.corda.ledger.utxo.flow.impl.transaction.filtered

import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.utxo.data.state.StateAndRefImpl
import net.corda.ledger.utxo.data.state.TransactionStateImpl
import net.corda.ledger.utxo.data.state.getEncumbranceGroup
Expand Down
2 changes: 1 addition & 1 deletion ...da/ledger/utxo/flow/impl/transaction/serializer/amqp/UtxoFilteredTransactionSerializer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.corda.ledger.utxo.flow.impl.transaction.serializer.amqp

import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.utxo.flow.impl.transaction.filtered.UtxoFilteredTransactionImpl
import net.corda.sandbox.type.SandboxConstants.CORDA_UNINJECTABLE_SERVICE
import net.corda.sandbox.type.UsedByFlow
Expand Down
2 changes: 1 addition & 1 deletion ...n/net/corda/ledger/utxo/flow/impl/transaction/filtered/UtxoFilteredTransactionTestBase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import net.corda.crypto.core.parseSecureHash
import net.corda.crypto.merkle.impl.MerkleTreeProviderImpl
import net.corda.ledger.common.data.transaction.TransactionMetadataImpl
import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.ledger.common.data.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.impl.transaction.filtered.factory.FilteredTransactionFactoryImpl
import net.corda.ledger.common.flow.transaction.filtered.FilteredTransaction
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters
import net.corda.ledger.common.flow.transaction.filtered.factory.ComponentGroupFilterParameters.AuditProof.AuditProofPredicate
import net.corda.ledger.common.testkit.getWireTransactionExample
Expand Down
4 changes: 4 additions & 0 deletions ...on-data/src/main/java/net/corda/ledger/common/data/transaction/filtered/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@Export
package net.corda.ledger.common.data.transaction.filtered;

import org.osgi.annotation.bundle.Export;
2 changes: 1 addition & 1 deletion ...action/filtered/FilteredComponentGroup.kt → ...action/filtered/FilteredComponentGroup.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.corda.ledger.common.flow.transaction.filtered
package net.corda.ledger.common.data.transaction.filtered

import net.corda.v5.base.annotations.CordaSerializable
import net.corda.v5.crypto.merkle.MerkleProof
Expand Down
2 changes: 1 addition & 1 deletion ...ansaction/filtered/FilteredTransaction.kt → ...ansaction/filtered/FilteredTransaction.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.corda.ledger.common.flow.transaction.filtered
package net.corda.ledger.common.data.transaction.filtered

import net.corda.ledger.common.data.transaction.WireTransaction
import net.corda.v5.base.annotations.CordaSerializable
Expand Down

0 comments on commit 0a02bf9

Please sign in to comment.