Drop deprecated v3 adapters (#7553)

Author: achamayou

CHANGELOG.md

@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Improved `ccf::historical::verify_self_issued_receipt` - now can verify receipts signed by the past service identities if they were back-endorsed (#7546).
 
+### Removed
+
+- `ccf::historical::adapter_v3` has been removed, `ccf::historical::read_only_adapter_v4` and `ccf::historical::read_write_adapter_v4` can be used instead (#7553).
+
 ## [7.0.0-dev6]
 
 [7.0.0-dev6]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev6

doc/build_apps/api.rst

@@ -126,7 +126,10 @@ Supporting Types
 Historical Queries
 ------------------
 
-.. doxygenfunction:: ccf::historical::adapter_v3
+.. doxygenfunction:: ccf::historical::read_only_adapter_v4
+   :project: CCF
+
+.. doxygenfunction:: ccf::historical::read_write_adapter_v4
    :project: CCF
 
 .. doxygenclass:: ccf::historical::AbstractStateCache

doc/build_apps/example_cpp.rst

@@ -190,7 +190,7 @@ This app can then define its own endpoints from a blank slate. If it wants to pr
 Historical Queries
 ~~~~~~~~~~~~~~~~~~
 
-This sample demonstrates how to define a historical query endpoint with the help of :cpp:func:`ccf::historical::adapter_v3`.
+This sample demonstrates how to define a historical query endpoint with the help of :cpp:func:`ccf::historical::adapter_v4`.
 Most endpoints operate over the `current` state of the KV, but these historical queries operate over `old` state, specifically over the writes made by a previous transaction.
 The adapter handles extracting the target :term:`Transaction ID` from the user's request, and interacting with the :ref:`Historical Queries API <build_apps/api:Historical Queries>` to asynchronously fetch this entry from the ledger.
 The deserialised and verified transaction is then presented to the handler code below, which performs reads and constructs a response like any other handler.

include/ccf/app_interface.h

@@ -2,7 +2,6 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
-#include "ccf/ccf_deprecated.h"
 #include "ccf/common_endpoint_registry.h"
 #include "ccf/node_context.h"
 

include/ccf/historical_queries_adapter.h

@@ -2,7 +2,6 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
-#include "ccf/ccf_deprecated.h"
 #include "ccf/endpoint_context.h"
 #include "ccf/historical_queries_interface.h"
 #include "ccf/node_context.h"
@@ -80,27 +79,6 @@ namespace ccf::historical
     ccf::SeqNo seqno,
     std::string& error_reason);
 
-  CCF_DEPRECATED("Replaced by _v4")
-  ccf::endpoints::EndpointFunction adapter_v3(
-    const HandleHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const TxIDExtractor& extractor = txid_from_header);
-
-  CCF_DEPRECATED("Replaced by _v4")
-  ccf::endpoints::ReadOnlyEndpointFunction read_only_adapter_v3(
-    const HandleReadOnlyHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const ReadOnlyTxIDExtractor& extractor = txid_from_header);
-
-  CCF_DEPRECATED("Replaced by _v4")
-  ccf::endpoints::EndpointFunction read_write_adapter_v3(
-    const HandleReadWriteHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const TxIDExtractor& extractor = txid_from_header);
-
   ccf::endpoints::ReadOnlyEndpointFunction read_only_adapter_v4(
     const HandleReadOnlyHistoricalQuery& f,
     ccf::AbstractNodeContext& node_context,

include/ccf/node/quote.h

@@ -2,7 +2,6 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
-#include "ccf/ccf_deprecated.h"
 #include "ccf/ds/quote_info.h"
 #include "ccf/pal/attestation_sev_snp.h"
 #include "ccf/pal/measurement.h"

scripts/headers-are-included.sh

@@ -9,7 +9,8 @@ find src/ include/ -type f -print0 | xargs -0 grep -h "#include" | grep -E "incl
 
 pushd include/ || exit 1
 # version.h may have been generated, if cmake was run
-find ccf -type f -name "*.h" | grep -v "ccf/version.h" | sort -u > /tmp/CCF_HEADERS
+# ccf_deprecated.h may not be included if no APIs are currently deprecated
+find ccf -type f -name "*.h" | grep -v "ccf/version.h" | grep -v "ccf/ccf_deprecated.h" | sort -u > /tmp/CCF_HEADERS
 popd || exit 1
 
 diff -y --suppress-common-lines /tmp/CCF_HEADERS /tmp/CCF_INCLUDED

src/node/historical_queries_adapter.cpp

@@ -406,58 +406,6 @@ namespace ccf::historical
     return HistoricalTxStatus::Valid;
   }
 
-  template <
-    class TQueryHandler,
-    class TEndpointFunction,
-    class TEndpointContext,
-    class TTxIDExtractor>
-  TEndpointFunction _adapter_v3(
-    const TQueryHandler& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const TTxIDExtractor& extractor)
-  {
-    return _adapter_v4<TQueryHandler, TEndpointFunction, TEndpointContext>(
-      f, node_context, available, extractor, default_error_handler);
-  }
-
-  ccf::endpoints::EndpointFunction adapter_v3(
-    const HandleHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const TxIDExtractor& extractor)
-  {
-    return _adapter_v3<
-      HandleHistoricalQuery,
-      ccf::endpoints::EndpointFunction,
-      ccf::endpoints::EndpointContext>(f, node_context, available, extractor);
-  }
-
-  ccf::endpoints::ReadOnlyEndpointFunction read_only_adapter_v3(
-    const HandleReadOnlyHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const ReadOnlyTxIDExtractor& extractor)
-  {
-    return _adapter_v3<
-      HandleReadOnlyHistoricalQuery,
-      ccf::endpoints::ReadOnlyEndpointFunction,
-      ccf::endpoints::ReadOnlyEndpointContext>(
-      f, node_context, available, extractor);
-  }
-
-  ccf::endpoints::EndpointFunction read_write_adapter_v3(
-    const HandleReadWriteHistoricalQuery& f,
-    ccf::AbstractNodeContext& node_context,
-    const CheckHistoricalTxStatus& available,
-    const TxIDExtractor& extractor)
-  {
-    return _adapter_v3<
-      HandleReadWriteHistoricalQuery,
-      ccf::endpoints::EndpointFunction,
-      ccf::endpoints::EndpointContext>(f, node_context, available, extractor);
-  }
-
   template <
     class TQueryHandler,
     class TEndpointFunction,