commit 2b0d177a2bbed481cf32a51d53b42cd509b9d8a8
author Wyatt Hepler <hepler@google.com> Mon May 03 09:34:18 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 05 18:49:38 2021 +0000
tree 23fcaec7e739f9ef312326d208f7733999664b11
parent a3ca62aeea7d27a117b4bbf91bf8e41611f7a62c

pw_rpc: Remove uses of PW_CHECK macros in headers

Change-Id: Ic8f8b6529a9d5eb8903fc4ba2a28c835abad5f78
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/43461
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Alexei Frolov <frolv@google.com>

pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h

diff --git a/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h b/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
index ba20aa2..4efd0c9 100644
--- a/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
+++ b/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
@@ -298,7 +298,7 @@
       stream_ended_ = true;
       break;
     default:
-      PW_CRASH("Unhandled PacketType");
+      pw_assert_HandleFailure();  // Unhandled PacketType
   }
   return OkStatus();
 }

pw_rpc/public/pw_rpc/internal/call.h

diff --git a/pw_rpc/public/pw_rpc/internal/call.h b/pw_rpc/public/pw_rpc/internal/call.h
index b5d5266..3e79657 100644
--- a/pw_rpc/public/pw_rpc/internal/call.h
+++ b/pw_rpc/public/pw_rpc/internal/call.h
@@ -16,7 +16,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "pw_assert/check.h"
+#include "pw_assert/assert.h"
 #include "pw_rpc/internal/channel.h"
 
 namespace pw::rpc {
@@ -59,22 +59,22 @@
   ServerContext& context();
 
   Server& server() const {
-    PW_DCHECK_NOTNULL(server_);
+    PW_DASSERT(server_ != nullptr);
     return *server_;
   }
 
   Channel& channel() const {
-    PW_DCHECK_NOTNULL(channel_);
+    PW_DASSERT(channel_ != nullptr);
     return *channel_;
   }
 
   Service& service() const {
-    PW_DCHECK_NOTNULL(service_);
+    PW_DASSERT(service_ != nullptr);
     return *service_;
   }
 
   const internal::Method& method() const {
-    PW_DCHECK_NOTNULL(method_);
+    PW_DASSERT(method_ != nullptr);
     return *method_;
   }
 

pw_rpc/raw/public/pw_rpc/raw_test_method_context.h

diff --git a/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h b/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
index aa69a99..0c005fd 100644
--- a/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
+++ b/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
@@ -297,7 +297,7 @@
       stream_ended_ = true;
       break;
     default:
-      PW_CRASH("Unhandled PacketType");
+      pw_assert_HandleFailure();  // Unhandled PacketType
   }
   return OkStatus();
 }