convenience methods

Author: jstuczyn

src/header/mod.rs

@@ -352,11 +352,7 @@ impl SphinxHeader {
         let shared_secret = PublicKey::from(shared_secret_bytes);
 
         // the rest are for the encapsulated routing info
-        let encapsulated_routing_info_bytes = bytes[32..HEADER_SIZE].to_vec();
-
-        let routing_info = Box::new(EncapsulatedRoutingInformation::from_bytes(
-            &encapsulated_routing_info_bytes,
-        )?);
+        let routing_info = Box::new(EncapsulatedRoutingInformation::from_bytes(&bytes[32..])?);
 
         Ok(SphinxHeader {
             shared_secret,

src/surb/mod.rs

@@ -99,7 +99,7 @@ impl SURBMaterial {
     }
 
     #[allow(non_snake_case)]
-    pub fn construct_legacy_SURB(self) -> Result<SURB> {
+    pub fn construct_SURB(self) -> Result<SURB> {
         let surb_initial_secret = StaticSecret::random();
         SURB::new(surb_initial_secret, self)
     }
@@ -224,6 +224,21 @@ impl SURB {
             payload_keys_material,
         })
     }
+
+    pub fn first_hop(&self) -> NodeAddressBytes {
+        self.first_hop_address
+    }
+
+    pub fn materials_count(&self) -> usize {
+        match &self.payload_keys_material {
+            PayloadKeysMaterial::DerivedKeys(keys) => keys.len(),
+            PayloadKeysMaterial::KeySeeds(seeds) => seeds.len(),
+        }
+    }
+
+    pub fn uses_key_seeds(&self) -> bool {
+        matches!(self.payload_keys_material, PayloadKeysMaterial::KeySeeds(_))
+    }
 }
 
 #[cfg(test)]