Revert "Simplify utxoindex key parsing"

This reverts commit 16641dc.

Author: the-phoenix

indexes/utxoindex/src/stores/indexed_utxos.rs

@@ -14,8 +14,6 @@ use std::fmt::Display;
 use std::sync::Arc;
 
 pub const VERSION_TYPE_SIZE: usize = size_of::<ScriptPublicKeyVersion>(); // Const since we need to re-use this a few times.
-const SCRIPT_LENGTH_SIZE: usize = size_of::<u64>();
-const SCRIPT_PUBLIC_KEY_BUCKET_HEADER_SIZE: usize = VERSION_TYPE_SIZE + SCRIPT_LENGTH_SIZE;
 
 /// [`ScriptPublicKeyBucket`].
 /// Consists of 2 bytes of little endian [VersionType] bytes, followed by a variable size of [ScriptVec].
@@ -24,7 +22,7 @@ struct ScriptPublicKeyBucket(Vec<u8>);
 
 impl From<&ScriptPublicKey> for ScriptPublicKeyBucket {
     fn from(script_public_key: &ScriptPublicKey) -> Self {
-        let mut bytes: Vec<u8> = Vec::with_capacity(SCRIPT_PUBLIC_KEY_BUCKET_HEADER_SIZE + script_public_key.script().len());
+        let mut bytes: Vec<u8> = Vec::with_capacity(VERSION_TYPE_SIZE + script_public_key.script().len());
         bytes.extend_from_slice(&script_public_key.version().to_le_bytes());
         bytes.extend_from_slice(&(script_public_key.script().len() as u64).to_le_bytes()); // TODO: Consider using a smaller integer
         bytes.extend_from_slice(script_public_key.script());
@@ -39,9 +37,9 @@ impl From<ScriptPublicKeyBucket> for ScriptPublicKey {
         );
 
         let script_size =
-            u64::from_le_bytes(bucket.0[VERSION_TYPE_SIZE..SCRIPT_PUBLIC_KEY_BUCKET_HEADER_SIZE].try_into().unwrap()) as usize;
+            u64::from_le_bytes(bucket.0[VERSION_TYPE_SIZE..VERSION_TYPE_SIZE + size_of::<u64>()].try_into().unwrap()) as usize;
         let script =
-            ScriptVec::from_slice(&bucket.0[SCRIPT_PUBLIC_KEY_BUCKET_HEADER_SIZE..SCRIPT_PUBLIC_KEY_BUCKET_HEADER_SIZE + script_size]);
+            ScriptVec::from_slice(&bucket.0[VERSION_TYPE_SIZE + size_of::<u64>()..VERSION_TYPE_SIZE + size_of::<u64>() + script_size]);
 
         Self::new(version, script)
     }
@@ -64,16 +62,6 @@ pub const TRANSACTION_OUTPOINT_KEY_SIZE: usize = kaspa_hashes::HASH_SIZE + size_
 #[derive(Eq, Hash, PartialEq, Debug, Copy, Clone)]
 struct TransactionOutpointKey([u8; TRANSACTION_OUTPOINT_KEY_SIZE]);
 
-impl TransactionOutpointKey {
-    fn from_slice(bytes: &[u8]) -> Self {
-        Self(bytes.try_into().expect("expected transaction outpoint key size"))
-    }
-
-    fn from_suffix(bytes: &[u8]) -> Self {
-        Self::from_slice(&bytes[bytes.len() - TRANSACTION_OUTPOINT_KEY_SIZE..])
-    }
-}
-
 impl From<TransactionOutpointKey> for TransactionOutpoint {
     fn from(key: TransactionOutpointKey) -> Self {
         let transaction_id = Hash::from_slice(&key.0[..kaspa_hashes::HASH_SIZE]);
@@ -118,6 +106,10 @@ impl UtxoEntryFullAccessKey {
         bytes.extend_from_slice(transaction_outpoint_key.as_ref());
         Self(Arc::new(bytes))
     }
+
+    pub fn extract_outpoint(&self) -> TransactionOutpoint {
+        TransactionOutpoint::from(TransactionOutpointKey(self.0[(self.0.len() - TRANSACTION_OUTPOINT_KEY_SIZE)..].try_into().unwrap()))
+    }
 }
 
 impl AsRef<[u8]> for UtxoEntryFullAccessKey {
@@ -173,7 +165,7 @@ impl UtxoSetByScriptPublicKeyStoreReader for DbUtxoSetByScriptPublicKeyStore {
             let utxos_by_script_public_keys_inner = CompactUtxoCollection::from_iter(
                 self.access.seek_iterator(Some(script_public_key_bucket.as_ref()), None, usize::MAX, false).map(|res| {
                     let (key, entry) = res.unwrap();
-                    (TransactionOutpointKey::from_slice(key.as_ref()).into(), entry)
+                    (TransactionOutpointKey(<[u8; TRANSACTION_OUTPOINT_KEY_SIZE]>::try_from(&key[..]).unwrap()).into(), entry)
                 }),
             );
             entries_count += utxos_by_script_public_keys_inner.len();
@@ -206,10 +198,9 @@ impl UtxoSetByScriptPublicKeyStoreReader for DbUtxoSetByScriptPublicKeyStore {
 
     // This can have a big memory footprint, so it should be used only for tests.
     fn get_all_outpoints(&self) -> StoreResult<HashSet<TransactionOutpoint>> {
-        Ok(HashSet::from_iter(self.access.iterator().map(|res| {
-            let (key, _) = res.unwrap();
-            TransactionOutpoint::from(TransactionOutpointKey::from_suffix(key.as_ref()))
-        })))
+        Ok(HashSet::from_iter(
+            self.access.iterator().map(|res| UtxoEntryFullAccessKey(Arc::new(res.unwrap().0.to_vec())).extract_outpoint()),
+        ))
     }
 }