f Use upstream scid_utils

Author: tnull

lightning-liquidity/src/lsps2/msgs.rs

@@ -8,6 +8,8 @@ use bitcoin::hashes::{Hash, HashEngine};
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
+use lightning::util::scid_utils;
+
 use crate::lsps0::ser::{
 	string_amount, string_amount_option, LSPSMessage, RequestId, ResponseError,
 };
@@ -129,9 +131,9 @@ pub struct InterceptScid(String);
 
 impl From<u64> for InterceptScid {
 	fn from(scid: u64) -> Self {
-		let block = utils::block_from_scid(&scid);
-		let tx_index = utils::tx_index_from_scid(&scid);
-		let vout = utils::vout_from_scid(&scid);
+		let block = scid_utils::block_from_scid(scid);
+		let tx_index = scid_utils::tx_index_from_scid(scid);
+		let vout = scid_utils::vout_from_scid(scid);
 
 		Self(format!("{}x{}x{}", block, tx_index, vout))
 	}

lightning-liquidity/src/utils.rs

@@ -4,29 +4,6 @@ use lightning::sign::EntropySource;
 use crate::lsps0::ser::RequestId;
 use crate::prelude::String;
 
-/// Maximum transaction index that can be used in a `short_channel_id`.
-/// This value is based on the 3-bytes available for tx index.
-pub const MAX_SCID_TX_INDEX: u64 = 0x00ffffff;
-
-/// Maximum vout index that can be used in a `short_channel_id`. This
-/// value is based on the 2-bytes available for the vout index.
-pub const MAX_SCID_VOUT_INDEX: u64 = 0xffff;
-
-/// Extracts the block height (most significant 3-bytes) from the `short_channel_id`.
-pub fn block_from_scid(short_channel_id: &u64) -> u32 {
-	(short_channel_id >> 40) as u32
-}
-
-/// Extracts the tx index (bytes [2..4]) from the `short_channel_id`.
-pub fn tx_index_from_scid(short_channel_id: &u64) -> u32 {
-	((short_channel_id >> 16) & MAX_SCID_TX_INDEX) as u32
-}
-
-/// Extracts the vout (bytes [0..2]) from the `short_channel_id`.
-pub fn vout_from_scid(short_channel_id: &u64) -> u16 {
-	((short_channel_id) & MAX_SCID_VOUT_INDEX) as u16
-}
-
 pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
 	let mut parts = human_readable_scid.split('x');
 
@@ -57,6 +34,7 @@ pub fn hex_str(value: &[u8]) -> String {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use lightning::util::scid_utils::{block_from_scid, tx_index_from_scid, vout_from_scid};
 
 	#[test]
 	fn parses_human_readable_scid_correctly() {
@@ -68,8 +46,8 @@ mod tests {
 
 		let scid = scid_from_human_readable_string(&human_readable_scid).unwrap();
 
-		assert_eq!(block_from_scid(&scid), block);
-		assert_eq!(tx_index_from_scid(&scid), tx_index);
-		assert_eq!(vout_from_scid(&scid), vout);
+		assert_eq!(block_from_scid(scid), block);
+		assert_eq!(tx_index_from_scid(scid), tx_index);
+		assert_eq!(vout_from_scid(scid), vout);
 	}
 }