Rebase fixes.

Author: mzimbres

include/boost/redis/adapter/detail/adapters.hpp

@@ -195,7 +195,7 @@ class general_aggregate<result<flat_response_value>> {
    }
 
    template <class String>
-   void operator()(resp3::basic_node<String> const& nd, system::error_code&)
+   void on_node(resp3::basic_node<String> const& nd, system::error_code&)
    {
       BOOST_ASSERT_MSG(!!result_, "Unexpected null pointer");
       switch (nd.data_type) {

include/boost/redis/adapter/detail/response_traits.hpp

@@ -110,9 +110,9 @@ struct response_traits<response<Ts...>> {
 template <>
 struct response_traits<generic_flat_response> {
    using response_type = generic_flat_response;
-   using adapter_type = vector_adapter<response_type>;
+   using adapter_type = general_aggregate<response_type>;
 
-   static auto adapt(response_type& v) noexcept { return adapter_type{v}; }
+   static auto adapt(response_type& v) noexcept { return adapter_type{&v}; }
 };
 }  // namespace boost::redis::adapter::detail
 

test/test_conn_exec_cancel.cpp

@@ -32,7 +32,7 @@ using boost::redis::operation;
 using boost::redis::error;
 using boost::redis::request;
 using boost::redis::response;
-using boost::redis::generic_flat_response;
+using boost::redis::generic_response;
 using boost::redis::ignore;
 using boost::redis::ignore_t;
 using boost::redis::logger;

test/test_conn_exec_error.cpp

@@ -21,7 +21,7 @@ using error_code = boost::system::error_code;
 using boost::redis::connection;
 using boost::redis::request;
 using boost::redis::response;
-using boost::redis::generic_flat_response;
+using boost::redis::generic_response;
 using boost::redis::ignore;
 using boost::redis::ignore_t;
 using boost::redis::error;
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(subscriber_wrong_syntax)
 
    conn->async_exec(req1, ignore, c1);
 
-   generic_flat_response gresp;
+   generic_response gresp;
    conn->set_receive_response(gresp);
 
    auto c3 = [&](error_code ec, std::size_t) {
@@ -326,4 +326,4 @@ BOOST_AUTO_TEST_CASE(issue_287_generic_response_error_then_success)
    BOOST_TEST(resp.error().diagnostic == "ERR wrong number of arguments for 'set' command");
 }
 
-}  // namespace
+}  // namespace

test/test_reader_fsm.cpp

@@ -167,7 +167,7 @@ void test_read_error()
 void test_parse_error()
 {
    multiplexer mpx;
-   generic_flat_response resp;
+   generic_response resp;
    mpx.set_receive_adapter(any_adapter{resp});
    reader_fsm fsm{mpx};
    error_code ec;