pw_rpc: Update FakeChannelOutput template parameters

- Remove the unused template parameter for the ChannelOutput buffer
  size, since the buffer was moved into pw_rpc.
- Replace the internal TestOutput class with RawFakeChannelOutput.
- Provide a way for upstream tests to access RPC packets directly from a
  FakeChannelOutput.

Requires: pigweed-internal:21780
Bug: 605
Change-Id: Ief5936370719f9681adc5a65e9762b8f413726fa
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/82180
Reviewed-by: Keir Mierle <keir@google.com>

3 files changed, 19 insertions, 23 deletions

diff --git a/pw_log_rpc/log_filter_service_test.cc b/pw_log_rpc/log_filter_service_test.cc
index 232e18e71..c42777974 100644
--- a/pw_log_rpc/log_filter_service_test.cc
+++ b/pw_log_rpc/log_filter_service_test.cc
@@ -57,7 +57,7 @@ class FilterServiceTest : public ::testing::Test {
 };
 
 TEST_F(FilterServiceTest, GetFilterIds) {
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, ListFilterIds, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, ListFilterIds, 1)
   context(filter_map_);
   context.call({});
   ASSERT_TRUE(context.done());
@@ -77,7 +77,7 @@ TEST_F(FilterServiceTest, GetFilterIds) {
 
   // No IDs reported when the filter map is empty.
   FilterMap empty_filter_map({});
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, ListFilterIds, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, ListFilterIds, 1)
   no_filter_context(empty_filter_map);
   no_filter_context.call({});
   ASSERT_TRUE(no_filter_context.done());
@@ -166,7 +166,7 @@ TEST_F(FilterServiceTest, SetFilterRules) {
   const auto request = EncodeFilterRequest(new_filter, request_buffer);
   ASSERT_EQ(request.status(), OkStatus());
 
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1)
   context(filter_map_);
   context.call(request.value());
 
@@ -211,7 +211,7 @@ TEST_F(FilterServiceTest, SetFilterRulesWhenUsedByDrain) {
   const auto request = EncodeFilterRequest(new_filter, request_buffer);
   ASSERT_EQ(request.status(), OkStatus());
 
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1)
   context(filter_map_);
   context.call(request.value());
 
@@ -221,7 +221,7 @@ TEST_F(FilterServiceTest, SetFilterRulesWhenUsedByDrain) {
   }
 
   // An empty request should not modify the filter.
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1)
   context_no_filter(filter_map_);
   context_no_filter.call({});
   i = 0;
@@ -264,7 +264,7 @@ TEST_F(FilterServiceTest, SetFilterRulesWhenUsedByDrain) {
   const auto second_filter_request =
       EncodeFilterRequest(second_filter, request_buffer);
   ASSERT_EQ(second_filter_request.status(), OkStatus());
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, SetFilter, 1)
   context_new_filter(filter_map_);
   context_new_filter.call(second_filter_request.value());
 
@@ -326,7 +326,7 @@ void VerifyFilterRules(protobuf::Decoder& decoder,
 }
 
 TEST_F(FilterServiceTest, GetFilterRules) {
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1)
   context(filter_map_);
 
   std::byte request_buffer[64];
@@ -351,7 +351,7 @@ TEST_F(FilterServiceTest, GetFilterRules) {
   rules1_[1].level_greater_than_or_equal = log::FilterRule::Level::ERROR_LEVEL;
   rules1_[1].any_flags_set = 0;
 
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1)
   context2(filter_map_);
   context2.call(request);
   ASSERT_EQ(context2.responses().size(), 1u);
@@ -366,7 +366,7 @@ TEST_F(FilterServiceTest, GetFilterRules) {
   rules1_[2].module_equals.assign(module2.begin(), module2.end());
   rules1_[3].action = Filter::Rule::Action::kInactive;
 
-  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1, 128)
+  PW_RAW_TEST_METHOD_CONTEXT(FilterService, GetFilter, 1)
   context3(filter_map_);
   context3.call(request);
   ASSERT_EQ(context3.responses().size(), 1u);
diff --git a/pw_log_rpc/log_service_test.cc b/pw_log_rpc/log_service_test.cc
index a69eda4a9..55e0de38e 100644
--- a/pw_log_rpc/log_service_test.cc
+++ b/pw_log_rpc/log_service_test.cc
@@ -41,7 +41,7 @@ namespace {
 using log::pw_rpc::raw::Logs;
 
 #define LOG_SERVICE_METHOD_CONTEXT \
-  PW_RAW_TEST_METHOD_CONTEXT(LogService, Listen, 10, 256)
+  PW_RAW_TEST_METHOD_CONTEXT(LogService, Listen, 10)
 
 constexpr size_t kMaxMessageSize = 50;
 constexpr size_t kMaxLogEntrySize =
@@ -502,9 +502,8 @@ TEST_F(LogServiceTest, InterruptedLogStreamSendsDropCount) {
   ASSERT_TRUE(drain.ok());
 
   LogService log_service(drain_map_);
-  const size_t output_buffer_size = 128;
   const size_t max_packets = 10;
-  rpc::RawFakeChannelOutput<10, output_buffer_size, 512> output;
+  rpc::RawFakeChannelOutput<10, 512> output;
   rpc::Channel channel(rpc::Channel::Create<drain_channel_id>(&output));
   rpc::Server server(std::span(&channel, 1));
 
@@ -513,9 +512,8 @@ TEST_F(LogServiceTest, InterruptedLogStreamSendsDropCount) {
       AddLogEntry(kMessage, kSampleMetadata, kSampleTimestamp);
   ASSERT_TRUE(status.ok());
 
-  // In reality less than output_buffer_size is given as a buffer, since some
-  // bytes are used for the RPC framing.
-  const uint32_t max_messages_per_response = output_buffer_size / status.size();
+  const uint32_t max_messages_per_response =
+      encoding_buffer_.size() / status.size();
   // Send less packets than the max to avoid crashes.
   const uint32_t packets_sent = max_packets / 2;
   const size_t total_entries = packets_sent * max_messages_per_response;
@@ -598,9 +596,8 @@ TEST_F(LogServiceTest, InterruptedLogStreamIgnoresErrors) {
   ASSERT_TRUE(drain.ok());
 
   LogService log_service(drain_map_);
-  const size_t output_buffer_size = 128;
   const size_t max_packets = 20;
-  rpc::RawFakeChannelOutput<max_packets, output_buffer_size, 512> output;
+  rpc::RawFakeChannelOutput<max_packets, 512> output;
   rpc::Channel channel(rpc::Channel::Create<drain_channel_id>(&output));
   rpc::Server server(std::span(&channel, 1));
 
@@ -609,9 +606,8 @@ TEST_F(LogServiceTest, InterruptedLogStreamIgnoresErrors) {
       AddLogEntry(kMessage, kSampleMetadata, kSampleTimestamp);
   ASSERT_TRUE(status.ok());
 
-  // In reality less than output_buffer_size is given as a buffer, since some
-  // bytes are used for the RPC framing.
-  const uint32_t max_messages_per_response = output_buffer_size / status.size();
+  const uint32_t max_messages_per_response =
+      encoding_buffer_.size() / status.size();
   // Send less packets than the max to avoid crashes.
   const uint32_t packets_sent = 4;
   const size_t total_entries = packets_sent * max_messages_per_response;
@@ -767,7 +763,7 @@ TEST_F(LogServiceTest, ReopenClosedLogStreamWithAcquiredBuffer) {
   ASSERT_TRUE(drain.ok());
 
   LogService log_service(drain_map_);
-  rpc::RawFakeChannelOutput<10, 128, 512> output;
+  rpc::RawFakeChannelOutput<10, 512> output;
   rpc::Channel channel(rpc::Channel::Create<drain_channel_id>(&output));
   rpc::Server server(std::span(&channel, 1));
 
diff --git a/pw_log_rpc/rpc_log_drain_test.cc b/pw_log_rpc/rpc_log_drain_test.cc
index 83fd467ba..c529528f6 100644
--- a/pw_log_rpc/rpc_log_drain_test.cc
+++ b/pw_log_rpc/rpc_log_drain_test.cc
@@ -112,7 +112,7 @@ TEST(RpcLogDrain, FlushingDrainWithOpenWriter) {
 
   std::byte encoding_buffer[128] = {};
 
-  rpc::RawFakeChannelOutput<3, 128> output;
+  rpc::RawFakeChannelOutput<3> output;
   rpc::Channel channel(rpc::Channel::Create<drain_id>(&output));
   rpc::Server server(std::span(&channel, 1));
 
@@ -151,7 +151,7 @@ TEST(RpcLogDrain, TryReopenOpenedDrain) {
   RpcLogDrainMap drain_map(drains);
   LogService log_service(drain_map);
 
-  rpc::RawFakeChannelOutput<1, 128> output;
+  rpc::RawFakeChannelOutput<1> output;
   rpc::Channel channel(rpc::Channel::Create<drain_id>(&output));
   rpc::Server server(std::span(&channel, 1));