Move reply_size to member function

oxidecomputer · Jun 29, 2023 · 3817af2 · 3817af2
1 parent 4f91421
commit 3817af2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/cmd/rpc/src/lib.rs b/cmd/rpc/src/lib.rs
@@ -406,15 +406,7 @@ impl<'a> RpcClient<'a> {
 
         let our_image_id = self.hubris.image_id().unwrap();
 
-        let nreply = match op.operation.encoding {
-            ::idol::syntax::Encoding::Zerocopy => {
-                self.hubris.typesize(op.ok)?
-            }
-            ::idol::syntax::Encoding::Ssmarshal
-            | ::idol::syntax::Encoding::Hubpack => {
-                self.hubris.hubpack_serialized_maxsize(op.ok)?
-            }
-        };
+        let nreply = op.reply_size()?;
 
         let header = RpcHeader {
             image_id: U64::from_bytes(our_image_id.try_into().unwrap()),

diff --git a/humility-hiffy/src/lib.rs b/humility-hiffy/src/lib.rs
@@ -778,21 +778,7 @@ impl<'a> HiffyContext<'a> {
         }
 
         ops.push(push(payload.len() as u32));
-        let reply_size = match op.operation.encoding {
-            ::idol::syntax::Encoding::Zerocopy => {
-                self.hubris.typesize(op.ok)?
-            }
-            ::idol::syntax::Encoding::Ssmarshal
-            | ::idol::syntax::Encoding::Hubpack => {
-                let ok = self.hubris.hubpack_serialized_maxsize(op.ok)?;
-                if let idol::IdolError::Complex(e) = op.error {
-                    ok.max(self.hubris.hubpack_serialized_maxsize(e.goff)?)
-                } else {
-                    ok
-                }
-            }
-        };
-        ops.push(push(reply_size as u32));
+        ops.push(push(op.reply_size()? as u32));
         if let Some(lease_size) = lease_size {
             ops.push(push(lease_size));
         }

diff --git a/humility-idol/src/lib.rs b/humility-idol/src/lib.rs
@@ -206,6 +206,24 @@ impl<'a> IdolOperation<'a> {
             format!("<Unknown {}.{} error: {}>", self.name.0, self.name.1, code)
         }
     }
+
+    pub fn reply_size(&self) -> Result<usize> {
+        let reply_size = match self.operation.encoding {
+            ::idol::syntax::Encoding::Zerocopy => {
+                self.hubris.typesize(self.ok)?
+            }
+            ::idol::syntax::Encoding::Ssmarshal
+            | ::idol::syntax::Encoding::Hubpack => {
+                let ok = self.hubris.hubpack_serialized_maxsize(self.ok)?;
+                if let IdolError::Complex(e) = self.error {
+                    ok.max(self.hubris.hubpack_serialized_maxsize(e.goff)?)
+                } else {
+                    ok
+                }
+            }
+        };
+        Ok(reply_size)
+    }
 }
 
 //