diff options
Diffstat (limited to 'src/transport/mycelium')
| -rw-r--r-- | src/transport/mycelium/mod.rs | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/transport/mycelium/mod.rs b/src/transport/mycelium/mod.rs index f1dbe40..d5d9271 100644 --- a/src/transport/mycelium/mod.rs +++ b/src/transport/mycelium/mod.rs @@ -355,8 +355,13 @@ impl Transport for MyceliumTransport { self.lookup_pubkey(&ip).await } - fn encode(&self, peer: &str, message: &ParsedMessage) -> Result<EncodedMessage> { - encode_message(peer, message) + fn encode_in( + &self, + peer: &str, + message: &ParsedMessage, + version: u8, + ) -> Result<EncodedMessage> { + encode_message(peer, message, version) } async fn send_encoded(&self, message: &EncodedMessage) -> Result<()> { @@ -573,9 +578,13 @@ async fn read_capped( /// A message as the Mycelium REST API takes it (the JSON body of an outbound message). /// Also the simulator's wire format (`transport::sim`), so tests go through the same -/// encoding. -pub(crate) fn encode_message(peer: &str, message: &ParsedMessage) -> Result<EncodedMessage> { - let (outbound, payload_len) = format_message(peer, message)?; +/// encoding. Its payload is in wire `version`. +pub(crate) fn encode_message( + peer: &str, + message: &ParsedMessage, + version: u8, +) -> Result<EncodedMessage> { + let (outbound, payload_len) = format_message(peer, message, version)?; Ok(EncodedMessage { peer: peer.to_owned(), address: peer.to_owned(), @@ -645,12 +654,13 @@ fn parse_message(message: &InboundMessage) -> Result<(String, ParsedMessage), Tr Ok((sender, parsed)) } -/// The message for Mycelium's API, and the length of its payload. +/// The message for Mycelium's API, its payload in wire `version`, and the payload's length. fn format_message( recipient: &str, message: &ParsedMessage, + version: u8, ) -> Result<(OutboundMessage, usize), TransportError> { - let payload_bytes = wire::encode(message)?; + let payload_bytes = wire::encode_in(message, version)?; let outbound = OutboundMessage { dst: Destination { pk: recipient.to_owned(), @@ -797,7 +807,7 @@ mod tests { #[test] fn every_kind_round_trips_through_the_api_body() { for message in wire::samples() { - let encoded = encode_message("peer", &message).unwrap(); + let encoded = encode_message("peer", &message, wire::VERSION).unwrap(); assert_eq!(encoded.kind, message.kind()); let decoded = decode_message(&encoded.body).unwrap(); assert_eq!( |
