persistence: use XOupoint instead of XOutputSeal in the APIs

Closes #290
RGB-WG · Jan 6, 2025 · af5a31b · af5a31b
1 parent 14ca8d8
commit af5a31b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/src/persistence/index.rs b/src/persistence/index.rs
@@ -27,7 +27,7 @@ use amplify::confinement;
 use nonasync::persistence::{CloneNoPersistence, Persisting};
 use rgb::{
     Assign, AssignmentType, BundleId, ContractId, ExposedState, Extension, Genesis, GenesisSeal,
-    GraphSeal, OpId, Operation, Opout, TransitionBundle, TypedAssigns, XChain, XOutputSeal,
+    GraphSeal, OpId, Operation, Opout, TransitionBundle, TypedAssigns, XChain, XOutpoint,
     XWitnessId,
 };
 
@@ -99,7 +99,7 @@ pub enum IndexInconsistency {
     BundleAbsent(OpId),
 
     /// outpoint {0} is not part of the contract {1}.
-    OutpointUnknown(XOutputSeal, ContractId),
+    OutpointUnknown(XOutpoint, ContractId),
 
     /// index already contains information about bundle {bundle_id} which
     /// specifies contract {present} instead of contract {expected}.
@@ -297,7 +297,7 @@ impl<P: IndexProvider> Index<P> {
 
     pub(super) fn contracts_assigning(
         &self,
-        outputs: BTreeSet<XOutputSeal>,
+        outputs: BTreeSet<XOutpoint>,
     ) -> Result<impl Iterator<Item = ContractId> + '_, IndexError<P>> {
         self.provider
             .contracts_assigning(outputs)
@@ -314,7 +314,7 @@ impl<P: IndexProvider> Index<P> {
     pub(super) fn opouts_by_outputs(
         &self,
         contract_id: ContractId,
-        outputs: impl IntoIterator<Item = impl Into<XOutputSeal>>,
+        outputs: impl IntoIterator<Item = impl Into<XOutpoint>>,
     ) -> Result<BTreeSet<Opout>, IndexError<P>> {
         Ok(self.provider.opouts_by_outputs(contract_id, outputs)?)
     }
@@ -368,7 +368,7 @@ pub trait IndexReadProvider {
 
     fn contracts_assigning(
         &self,
-        outputs: BTreeSet<XOutputSeal>,
+        outputs: BTreeSet<XOutpoint>,
     ) -> Result<impl Iterator<Item = ContractId> + '_, Self::Error>;
 
     fn public_opouts(
@@ -379,7 +379,7 @@ pub trait IndexReadProvider {
     fn opouts_by_outputs(
         &self,
         contract_id: ContractId,
-        outputs: impl IntoIterator<Item = impl Into<XOutputSeal>>,
+        outputs: impl IntoIterator<Item = impl Into<XOutpoint>>,
     ) -> Result<BTreeSet<Opout>, IndexReadError<Self::Error>>;
 
     fn opouts_by_terminals(

diff --git a/src/persistence/memory.rs b/src/persistence/memory.rs
@@ -1273,14 +1273,18 @@ impl IndexReadProvider for MemIndex {
 
     fn contracts_assigning(
         &self,
-        outputs: BTreeSet<XOutputSeal>,
+        outpoints: BTreeSet<XOutpoint>,
     ) -> Result<impl Iterator<Item = ContractId> + '_, Self::Error> {
         Ok(self
             .contract_index
             .iter()
             .flat_map(move |(contract_id, index)| {
-                outputs.clone().into_iter().filter_map(|outpoint| {
-                    if index.outpoint_opouts.contains_key(&outpoint) {
+                outpoints.clone().into_iter().filter_map(|outpoint| {
+                    if index
+                        .outpoint_opouts
+                        .keys()
+                        .any(|seal| seal.to_outpoint() == outpoint)
+                    {
                         Some(*contract_id)
                     } else {
                         None
@@ -1303,17 +1307,19 @@ impl IndexReadProvider for MemIndex {
     fn opouts_by_outputs(
         &self,
         contract_id: ContractId,
-        outputs: impl IntoIterator<Item = impl Into<XOutputSeal>>,
+        outpoints: impl IntoIterator<Item = impl Into<XOutpoint>>,
     ) -> Result<BTreeSet<Opout>, IndexReadError<Self::Error>> {
         let index = self
             .contract_index
             .get(&contract_id)
             .ok_or(IndexInconsistency::ContractAbsent(contract_id))?;
         let mut opouts = BTreeSet::new();
-        for output in outputs.into_iter().map(|o| o.into()) {
+        for output in outpoints.into_iter().map(|o| o.into()) {
             let set = index
                 .outpoint_opouts
-                .get(&output)
+                .iter()
+                .find(|(seal, _)| seal.to_outpoint() == output)
+                .map(|(_, set)| set.to_unconfined())
                 .ok_or(IndexInconsistency::OutpointUnknown(output, contract_id))?;
             opouts.extend(set)
         }

diff --git a/src/persistence/stock.rs b/src/persistence/stock.rs
@@ -526,7 +526,7 @@ impl<S: StashProvider, H: StateProvider, P: IndexProvider> Stock<S, H, P> {
     /// output seals.
     pub fn contracts_assigning(
         &self,
-        outputs: impl IntoIterator<Item = impl Into<XOutputSeal>>,
+        outputs: impl IntoIterator<Item = impl Into<XOutpoint>>,
     ) -> Result<impl Iterator<Item = ContractId> + '_, StockError<S, H, P>> {
         let outputs = outputs
             .into_iter()