Post-rebase fixups

Author: bboston7

src/Makefile.am

@@ -100,6 +100,9 @@ XDR_FEATURE_FLAGS =
 if CAP_0071
 XDR_FEATURE_FLAGS += -DCAP_0071
 endif
+if ENABLE_CAP_0083
+XDR_FEATURE_FLAGS += -DCAP_0083
+endif
 
 SUFFIXES = .x .h .rs
 .x.h:

src/herder/HerderSCPDriver.cpp

@@ -260,13 +260,9 @@ HerderSCPDriver::isEnvelopeReady(SCPEnvelope const& env) const
 bool
 HerderSCPDriver::protocolAllowsEmptyTxSetValues() const
 {
-#ifdef CAP_0083
     auto const& lcl = mLedgerManager.getLastClosedLedgerHeader();
     return protocolVersionStartsFrom(lcl.header.ledgerVersion,
                                      EMPTY_TX_SET_PROTOCOL_VERSION);
-#else
-    return false;
-#endif
 }
 
 bool

src/overlay/ItemFetcher.h

@@ -70,14 +70,9 @@ class ItemFetcher : private NonMovableOrCopyable
     std::vector<SCPEnvelope> fetchingFor(Hash const& itemHash) const;
 
     /**
-     * Return how long the fetcher has been waiting for the item identified by
+     * Returns the time since the fetch was started for the item identified by
      * @p hash. Returns nullopt if the item is not being fetched.
      */
-    // TODO: Maybe update the name of this function and doc comment. I don't
-    // like "waiting time" or "nulopt if the item is not being fetched".
-    // Technically this returns the time since the fetch was started, but if the
-    // fetch has completed it STILL returns the time since the fetch started,
-    // and so it's not necessarily all "waiting time".
     std::optional<std::chrono::milliseconds>
     getWaitingTime(Hash const& itemHash) const;
 

src/util/ProtocolVersion.h

@@ -68,6 +68,10 @@ constexpr ProtocolVersion FIRST_PROTOCOL_CAP71 = ProtocolVersion::V_27;
 constexpr ProtocolVersion FIRST_PROTOCOL_CAP71 = ProtocolVersion::V_UINT32_MAX;
 #endif
 
-// TODO(rebase): Gate this behind CAP_0083 and remove ifdef in HerderSCP::protocolSupportsEmptyLedgers (or whatever it's called)?
+#ifdef CAP_0083
 constexpr ProtocolVersion EMPTY_TX_SET_PROTOCOL_VERSION = ProtocolVersion::V_27;
+#else
+constexpr ProtocolVersion EMPTY_TX_SET_PROTOCOL_VERSION =
+    ProtocolVersion::V_UINT32_MAX;
+#endif
 }