Enable smallvec const_generics and optimize script vector size (kaspanet#757)

Co-authored-by: robojobot <[email protected]>
Co-authored-by: Ori Newman <[email protected]>

Author: 3 people

Cargo.toml

@@ -244,7 +244,7 @@ sha1 = "0.10.6"
 sha2 = "0.10.8"
 sha3 = "0.10.8"
 slugify-rs = "0.0.3"
-smallvec = { version = "1.11.1", features = ["serde"] }
+smallvec = { version = "1.11.1", features = ["serde", "const_generics"] }
 sorted-insert = "0.2.3"
 subtle = { version = "2.5.0", default-features = false }
 sysinfo = "0.31.2"

consensus/core/src/tx.rs

@@ -684,7 +684,7 @@ mod tests {
         let vec = (0..SCRIPT_VECTOR_SIZE as u8).collect::<Vec<_>>();
         let spk = ScriptPublicKey::from_vec(0xc0de, vec.clone());
         let hex: String = serde_json::to_string(&spk).unwrap();
-        assert_eq!("\"c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223\"", hex);
+        assert_eq!("\"c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122\"", hex);
         let spk = serde_json::from_str::<ScriptPublicKey>(&hex).unwrap();
         assert_eq!(spk.version, 0xc0de);
         assert_eq!(spk.script.as_slice(), vec.as_slice());

consensus/core/src/tx/script_public_key.rs

@@ -19,7 +19,7 @@ use wasm_bindgen::prelude::*;
 use workflow_wasm::prelude::*;
 
 /// Size of the underlying script vector of a script.
-pub const SCRIPT_VECTOR_SIZE: usize = 36;
+pub const SCRIPT_VECTOR_SIZE: usize = 35;
 
 /// Used as the underlying type for script public key data, optimized for the common p2pk script size (34).
 pub type ScriptVec = SmallVec<[u8; SCRIPT_VECTOR_SIZE]>;
@@ -415,7 +415,7 @@ mod tests {
         let vec = (0..SCRIPT_VECTOR_SIZE as u8).collect::<Vec<_>>();
         let spk = ScriptPublicKey::from_vec(0xc0de, vec.clone()); // 0xc0de == 49374,
         let hex: String = serde_json::to_string(&spk).unwrap();
-        assert_eq!("\"c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223\"", hex);
+        assert_eq!("\"c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122\"", hex);
         let spk = serde_json::from_str::<ScriptPublicKey>(&hex).unwrap();
         assert_eq!(spk.version, 0xc0de);
         assert_eq!(spk.script.as_slice(), vec.as_slice());
@@ -453,7 +453,7 @@ mod tests {
         let version = 0xc0de;
         let vec: Vec<u8> = (0..SCRIPT_VECTOR_SIZE as u8).collect();
         let spk = ScriptPublicKey::from_vec(version, vec.clone());
-        let str = "c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212223";
+        let str = "c0de000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122";
         let js = to_value(&spk).unwrap();
         assert_eq!(js.as_string().unwrap(), str);
         let script_hex = spk.script_as_hex();

rpc/core/src/model/hex_cnv.rs

@@ -115,13 +115,13 @@ mod tests {
 
     #[test]
     fn test_smallvec_hex_convert() {
-        type TestVec = SmallVec<[u8; 36]>;
+        type TestVec = SmallVec<[u8; 35]>;
 
         let v: TestVec = smallvec![0x0, 0xab, 0x55, 0x30, 0x1f, 0x63];
         let k = "00ab55301f63";
         assert_eq!(k.len(), v.len() * 2);
         assert_eq!(k.to_string(), v.to_rpc_hex());
-        assert_eq!(SmallVec::<[u8; 36]>::from_rpc_hex(k).unwrap(), v);
+        assert_eq!(SmallVec::<[u8; 35]>::from_rpc_hex(k).unwrap(), v);
 
         assert!(TestVec::from_rpc_hex("not a number").is_err());
         assert!(TestVec::from_rpc_hex("ab01").is_ok());

rpc/core/src/model/tests.rs

@@ -321,7 +321,7 @@ mod mockery {
 
     impl Mock for ScriptPublicKey {
         fn mock() -> Self {
-            let mut bytes: [u8; 36] = [0; 36];
+            let mut bytes: [u8; 35] = [0; 35];
             rand::thread_rng().fill(&mut bytes[..]);
             ScriptPublicKey::from_vec(0, bytes.to_vec())
         }

utils/src/hex.rs

@@ -142,13 +142,13 @@ mod tests {
 
     #[test]
     fn test_smallvec_hex_convert() {
-        type TestVec = SmallVec<[u8; 36]>;
+        type TestVec = SmallVec<[u8; 35]>;
 
         let v: TestVec = smallvec![0x0, 0xab, 0x55, 0x30, 0x1f, 0x63];
         let k = "00ab55301f63";
         assert_eq!(k.len(), v.len() * 2);
         assert_eq!(k.to_string(), v.to_hex());
-        assert_eq!(SmallVec::<[u8; 36]>::from_hex(k).unwrap(), v);
+        assert_eq!(SmallVec::<[u8; 35]>::from_hex(k).unwrap(), v);
 
         assert!(TestVec::from_hex("not a number").is_err());
         assert!(TestVec::from_hex("ab01").is_ok());