move spk encoding to txscript module

kaspanet · Nov 9, 2024 · 8422331 · 8422331
1 parent 3eae88a
commit 8422331
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/consensus/core/src/tx/script_public_key.rs b/consensus/core/src/tx/script_public_key.rs
@@ -56,17 +56,6 @@ pub struct ScriptPublicKey {
     pub(super) script: ScriptVec, // Kept private to preserve read-only semantics
 }
 
-impl ScriptPublicKey {
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let version = self.version.to_be_bytes();
-        let script = self.script();
-        let mut v = Vec::with_capacity(version.len() + script.len());
-        v.extend_from_slice(&version);
-        v.extend_from_slice(script);
-        v
-    }
-}
-
 impl std::fmt::Debug for ScriptPublicKey {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("ScriptPublicKey").field("version", &self.version).field("script", &self.script.to_hex()).finish()

diff --git a/crypto/txscript/src/lib.rs b/crypto/txscript/src/lib.rs
@@ -522,6 +522,21 @@ impl<'a, T: VerifiableTransaction, Reused: SigHashReusedValues> TxScriptEngine<'
     }
 }
 
+trait SpkEncoding {
+    fn to_bytes(&self) -> Vec<u8>;
+}
+
+impl SpkEncoding for ScriptPublicKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        let version = self.version.to_be_bytes();
+        let script = self.script();
+        let mut v = Vec::with_capacity(version.len() + script.len());
+        v.extend_from_slice(&version);
+        v.extend_from_slice(script);
+        v
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::iter::once;

diff --git a/crypto/txscript/src/opcodes/mod.rs b/crypto/txscript/src/opcodes/mod.rs
@@ -3,7 +3,7 @@ mod macros;
 
 use crate::data_stack::{DataStack, Kip10I64, OpcodeData};
 use crate::{
-    ScriptSource, TxScriptEngine, TxScriptError, LOCK_TIME_THRESHOLD, MAX_TX_IN_SEQUENCE_NUM, NO_COST_OPCODE,
+    ScriptSource, SpkEncoding, TxScriptEngine, TxScriptError, LOCK_TIME_THRESHOLD, MAX_TX_IN_SEQUENCE_NUM, NO_COST_OPCODE,
     SEQUENCE_LOCK_TIME_DISABLED, SEQUENCE_LOCK_TIME_MASK,
 };
 use blake2b_simd::Params;