cleaning up

veilid-core/src/rpc_processor/coders/peer_info.rs

@@ -15,7 +15,7 @@ pub fn encode_peer_info(
     for (i, nid) in peer_info.node_ids.iter().enumerate() {
         encode_typed_key(
             nid,
-            &mut nids_builder.get(
+            &mut nids_builder.reborrow().get(
                 i.try_into()
                     .map_err(RPCError::map_invalid_format("out of bound error"))?,
             ),
@@ -39,7 +39,7 @@ pub fn decode_peer_info(
         .reborrow()
         .get_signed_node_info()
         .map_err(RPCError::protocol)?;
-    let node_ids = TypedKeySet::with_capacity(nids_reader.len() as usize);
+    let mut node_ids = TypedKeySet::with_capacity(nids_reader.len() as usize);
     for nid_reader in nids_reader.iter() {
         node_ids.add(decode_typed_key(&nid_reader)?);
     }

veilid-core/src/rpc_processor/coders/signed_direct_node_info.rs

@@ -22,7 +22,7 @@ pub fn encode_signed_direct_node_info(
     for (i, typed_signature) in signed_direct_node_info.signatures.iter().enumerate() {
         encode_typed_signature(
             typed_signature,
-            &mut sigs_builder.get(
+            &mut sigs_builder.reborrow().get(
                 i.try_into()
                     .map_err(RPCError::map_invalid_format("out of bound error"))?,
             ),

veilid-core/src/rpc_processor/coders/signed_relayed_node_info.rs

@@ -18,7 +18,7 @@ pub fn encode_signed_relayed_node_info(
     for (i, typed_key) in signed_relayed_node_info.relay_ids.iter().enumerate() {
         encode_typed_key(
             typed_key,
-            &mut rids_builder.get(
+            &mut rids_builder.reborrow().get(
                 i.try_into()
                     .map_err(RPCError::map_invalid_format("out of bound error"))?,
             ),
@@ -42,7 +42,7 @@ pub fn encode_signed_relayed_node_info(
     for (i, typed_signature) in signed_relayed_node_info.signatures.iter().enumerate() {
         encode_typed_signature(
             typed_signature,
-            &mut sigs_builder.get(
+            &mut sigs_builder.reborrow().get(
                 i.try_into()
                     .map_err(RPCError::map_invalid_format("out of bound error"))?,
             ),
@@ -81,7 +81,7 @@ pub fn decode_signed_relayed_node_info(
         .reborrow()
         .get_relay_info()
         .map_err(RPCError::protocol)?;
-    let relay_info = decode_signed_direct_node_info(&ri_reader, crypto, &mut relay_ids)?;
+    let relay_info = decode_signed_direct_node_info(&ri_reader, crypto.clone(), &mut relay_ids)?;
 
     // Ensure the relay info for the node has a superset of the crypto kinds of the node it is relaying
     if common_crypto_kinds(

veilid-core/src/rpc_processor/coders/typed_key.rs

@@ -14,6 +14,6 @@ pub fn decode_typed_key(typed_key: &veilid_capnp::typed_key::Reader) -> Result<T
 
 pub fn encode_typed_key(typed_key: &TypedKey, builder: &mut veilid_capnp::typed_key::Builder) {
     builder.set_kind(u32::from_be_bytes(typed_key.kind.0));
-    let mut key_builder = builder.init_key();
+    let mut key_builder = builder.reborrow().init_key();
     encode_key256(&typed_key.key, &mut key_builder);
 }

veilid-core/src/rpc_processor/coders/typed_signature.rs

@@ -19,6 +19,6 @@ pub fn encode_typed_signature(
     builder: &mut veilid_capnp::typed_signature::Builder,
 ) {
     builder.set_kind(u32::from_be_bytes(typed_signature.kind.0));
-    let mut sig_builder = builder.init_signature();
+    let mut sig_builder = builder.reborrow().init_signature();
     encode_signature512(&typed_signature.signature, &mut sig_builder);
 }

veilid-core/src/rpc_processor/mod.rs

@@ -621,7 +621,7 @@ impl RPCProcessor {
                 // Get the actual destination node id accounting for relays
                 let (node_ref, destination_node_ref) = if let Destination::Relay {
                     relay: _,
-                    target: ref target,
+                    ref target,
                     safety_selection: _,
                 } = dest
                 {
@@ -1392,7 +1392,7 @@ impl RPCProcessor {
     }
 
     #[instrument(level = "trace", skip(self, body), err)]
-    pub fn enqueue_safety_routed_message(
+    fn enqueue_safety_routed_message(
         &self,
         direct: RPCMessageHeaderDetailDirect,
         remote_safety_route: PublicKey,
@@ -1423,7 +1423,7 @@ impl RPCProcessor {
     }
 
     #[instrument(level = "trace", skip(self, body), err)]
-    pub fn enqueue_private_routed_message(
+    fn enqueue_private_routed_message(
         &self,
         direct: RPCMessageHeaderDetailDirect,
         remote_safety_route: PublicKey,