From c140781b586328c16a80fcbec12d52e15310add0 Mon Sep 17 00:00:00 2001 From: Drew Tada Date: Mon, 1 Apr 2024 11:34:21 -0600 Subject: [PATCH 1/3] docstring for await_next_request_body --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 322a83c..779445e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -217,6 +217,7 @@ pub fn get_capability(our: &Address, params: &str) -> Option { .cloned() } +/// if the next message is a request, return its body, otherwise, return an error pub fn await_next_request_body() -> anyhow::Result> { let Ok(Message::Request { body, .. }) = await_message() else { return Err(anyhow::anyhow!("failed to get request body, bailing out")); From f2bdfed66c9d76ade4d6c6634eea3c2f2d2e9d95 Mon Sep 17 00:00:00 2001 From: Drew Tada Date: Mon, 1 Apr 2024 11:44:03 -0600 Subject: [PATCH 2/3] changed to await_next_message_body --- src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 779445e..e066f56 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -217,10 +217,10 @@ pub fn get_capability(our: &Address, params: &str) -> Option { .cloned() } -/// if the next message is a request, return its body, otherwise, return an error -pub fn await_next_request_body() -> anyhow::Result> { - let Ok(Message::Request { body, .. }) = await_message() else { - return Err(anyhow::anyhow!("failed to get request body, bailing out")); - }; - Ok(body) +/// get the next message body from the message queue, or propagate the error +pub fn await_next_message_body() -> anyhow::Result> { + match await_message() { + Ok(msg) => Ok(msg.body().to_vec()), + Err(e) => Err(e.into()), + } } From 0a52bf72de4005a339b4aefc4869ce13e9491b3b Mon Sep 17 00:00:00 2001 From: Drew Tada Date: Tue, 2 Apr 2024 12:30:37 -0600 Subject: [PATCH 3/3] edited return type --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index e066f56..3eb46da 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -218,7 +218,7 @@ pub fn get_capability(our: &Address, params: &str) -> Option { } /// get the next message body from the message queue, or propagate the error -pub fn await_next_message_body() -> anyhow::Result> { +pub fn await_next_message_body() -> Result, SendError> { match await_message() { Ok(msg) => Ok(msg.body().to_vec()), Err(e) => Err(e.into()),