chore: fix clippy lints

Author: dr-orlovsky

Cargo.lock

@@ -59,11 +59,3 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = [ "all" ]
-
-[patch.crates-io]
-strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "phantom" }
-commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" }
-bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
-bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
-bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
-bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }

Cargo.toml

@@ -61,5 +61,6 @@ pub use seal::{
 };
 pub use state::{ConfidentialState, ExposedState, StateCommitment, StateData, StateType};
 pub use xchain::{
-    AltLayer1, AltLayer1Set, XChain, XChainParseError, XCHAIN_BITCOIN_PREFIX, XCHAIN_LIQUID_PREFIX,
+    AltLayer1, AltLayer1Set, XChain, XChainParseError, XOutpoint, XCHAIN_BITCOIN_PREFIX,
+    XCHAIN_LIQUID_PREFIX,
 };

src/contract/mod.rs

@@ -34,7 +34,16 @@ use strict_encoding::{
     StrictSum, StrictType, StrictUnion, TypedRead, TypedWrite, WriteUnion,
 };
 
-use crate::{Layer1, OutputSeal, LIB_NAME_RGB};
+use crate::{Layer1, OutputSeal, XOutputSeal, LIB_NAME_RGB};
+
+pub const XCHAIN_BITCOIN_PREFIX: &str = "bc";
+pub const XCHAIN_LIQUID_PREFIX: &str = "lq";
+
+pub type XOutpoint = XChain<Outpoint>;
+
+impl From<XOutputSeal> for XOutpoint {
+    fn from(seal: XChain<OutputSeal>) -> Self { seal.map(Outpoint::from) }
+}
 
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Display)]
 #[display(lowercase)]
@@ -81,9 +90,6 @@ impl CommitEncode for AltLayer1Set {
     }
 }
 
-pub const XCHAIN_BITCOIN_PREFIX: &str = "bc";
-pub const XCHAIN_LIQUID_PREFIX: &str = "lq";
-
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 #[cfg_attr(
     feature = "serde",
@@ -341,7 +347,3 @@ where T: StrictDumb + StrictEncode + StrictDecode
         }
     }
 }
-
-impl From<XChain<OutputSeal>> for XChain<Outpoint> {
-    fn from(seal: XChain<OutputSeal>) -> Self { seal.map(Outpoint::from) }
-}

src/contract/xchain.rs

@@ -23,8 +23,8 @@
 use std::collections::{BTreeMap, BTreeSet, VecDeque};
 
 use bp::dbc::Anchor;
-use bp::seals::txout::{CloseMethod, ExplicitSeal, TxoSeal, Witness};
-use bp::{dbc, Outpoint, Txid};
+use bp::seals::txout::{CloseMethod, TxoSeal, Witness};
+use bp::{dbc, Outpoint};
 use commit_verify::mpc;
 use single_use_seals::SealWitness;
 
@@ -34,7 +34,7 @@ use crate::vm::AluRuntime;
 use crate::{
     AltLayer1, BundleId, ContractId, Layer1, OpId, OpRef, OpType, Operation, Opout, Schema,
     SchemaId, SchemaRoot, Script, SubSchema, Transition, TransitionBundle, TypedAssigns, WitnessId,
-    XAnchor, XChain, XOutputSeal, XPubWitness, XWitness,
+    XAnchor, XChain, XOutpoint, XOutputSeal, XPubWitness, XWitness,
 };
 
 #[derive(Clone, Debug, Display, Error, From)]
@@ -434,8 +434,8 @@ impl<'consignment, 'resolver, C: ConsignmentApi, R: ResolveWitness>
         &mut self,
         layer1: Layer1,
         bundle: &TransitionBundle,
-    ) -> (Vec<XChain<ExplicitSeal<Txid>>>, BTreeMap<OpId, BTreeSet<XChain<Outpoint>>>) {
-        let mut input_map: BTreeMap<OpId, BTreeSet<XChain<Outpoint>>> = bmap!();
+    ) -> (Vec<XOutputSeal>, BTreeMap<OpId, BTreeSet<XOutpoint>>) {
+        let mut input_map: BTreeMap<OpId, BTreeSet<XOutpoint>> = bmap!();
         let mut seals = vec![];
         for (opid, transition) in &bundle.known_transitions {
             let opid = *opid;