into_static for serde_sv2 primitives

stratum-mining · Jun 11, 2024 · 4e98733 · 4e98733
1 parent 2894a84
commit 4e98733
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 10 deletions.
diff --git a/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/mod.rs b/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/mod.rs
@@ -1,5 +1,6 @@
 use super::{ShortTxId, Signature, B016M, B0255, B064K, U24, U256};
 use crate::Error;
+use alloc::vec::Vec;
 use core::convert::TryInto;
 use serde::{de::Visitor, Serialize};
 
@@ -22,6 +23,23 @@ struct Seq<'s, T: Clone + Serialize + TryFromBSlice<'s>> {
     _a: core::marker::PhantomData<T>,
 }
 
+impl<'s, T: Clone + Serialize + TryFromBSlice<'s>> Seq<'s, T> {
+    pub fn parse(self) -> Result<Vec<T>, ()> {
+        let mut ret = Vec::with_capacity(self.size as usize);
+        let elem_len = self.size as usize;
+        let mut first = 0;
+        let mut last = elem_len;
+        while last <= self.data.len() {
+            let slice = &self.data[first..last];
+            let elem = T::try_from_slice(slice).map_err(|_| ())?;
+            ret.push(elem);
+            first += elem_len;
+            last += elem_len;
+        }
+        Ok(ret)
+    }
+}
+
 struct SeqVisitor<T> {
     inner_type_size: u8,
     max_len: SeqMaxLen,

diff --git a/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/option.rs b/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/option.rs
@@ -239,7 +239,15 @@ impl<'s> Sv2Option<'s, U256<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Sv2Option {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
     pub fn inner_as_ref(&self) -> &[&[u8]] {
@@ -254,7 +262,14 @@ impl<'s> Sv2Option<'s, u32> {
                 data: Some(inner),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            Sv2Option {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }

diff --git a/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/seq0255.rs b/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/seq0255.rs
@@ -243,7 +243,15 @@ impl<'s> Seq0255<'s, U256<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Seq0255 {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
     pub fn inner_as_ref(&self) -> &[&[u8]] {
@@ -258,7 +266,14 @@ impl<'s> Seq0255<'s, u32> {
                 data: Some(inner),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            Seq0255 {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }

diff --git a/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/seq064k.rs b/protocols/v2/binary-sv2/serde-sv2/src/primitives/sequences/seq064k.rs
@@ -452,7 +452,15 @@ impl<'s> Seq064K<'s, B064K<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }
@@ -466,7 +474,15 @@ impl<'s> Seq064K<'s, B016M<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
     pub fn to_vec(&self) -> Vec<Vec<u8>> {
@@ -486,7 +502,14 @@ impl<'s> Seq064K<'s, u32> {
                 data: Some(inner),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }
@@ -498,7 +521,14 @@ impl<'s> Seq064K<'s, u16> {
                 data: Some(inner),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }
@@ -513,7 +543,15 @@ impl<'s> Seq064K<'s, ShortTxId<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
     pub fn to_vec(&self) -> Vec<Vec<u8>> {
@@ -535,7 +573,15 @@ impl<'s> Seq064K<'s, U256<'s>> {
                 data: Some(data),
             }
         } else {
-            panic!()
+            // this is an already valid seq should be safe to call the unwraps.
+            // also this library shouldn't be used for priduction envs so is ok do thigs like this
+            // one
+            let data = self.seq.unwrap().parse().unwrap();
+            let data = data.into_iter().map(|i| i.into_static()).collect();
+            Seq064K {
+                seq: None,
+                data: Some(data),
+            }
         }
     }
 }