moq-test client simplification

Summary: Remove some parent classes, methods and members that are unused

Reviewed By: sharmafb

Differential Revision: D86428305

fbshipit-source-id: d9a09482db61a369e1380273cb5aca41f9131f55

Author: afrind

moxygen/moqtest/MoQTestClient.cpp

@@ -43,7 +43,7 @@ folly::coro::Task<void> MoQTestClient::connect(folly::EventBase* evb) {
       std::chrono::milliseconds(FLAGS_connect_timeout),
       std::chrono::seconds(FLAGS_transaction_timeout),
       nullptr,
-      shared_from_this(),
+      nullptr,
       quic::TransportSettings());
 
   co_return;
@@ -53,10 +53,12 @@ void MoQTestClient::initialize() {
   // Create a receiver for the client
   subReceiver_ = std::make_shared<ObjectReceiver>(
       ObjectReceiver::SUBSCRIBE,
-      std::shared_ptr<MoQTestClient>(shared_from_this()));
+      std::shared_ptr<ObjectReceiverCallback>(
+          std::shared_ptr<void>(), &objectReceiverCallback_));
   fetchReceiver_ = std::make_shared<ObjectReceiver>(
       ObjectReceiver::FETCH,
-      std::shared_ptr<MoQTestClient>(shared_from_this()));
+      std::shared_ptr<ObjectReceiverCallback>(
+          std::shared_ptr<void>(), &objectReceiverCallback_));
 }
 
 folly::coro::Task<moxygen::TrackNamespace> MoQTestClient::subscribe(
@@ -136,7 +138,7 @@ folly::coro::Task<moxygen::TrackNamespace> MoQTestClient::fetch(
 }
 
 ObjectReceiverCallback::FlowControlState MoQTestClient::onObject(
-    folly::Optional<TrackAlias> /* trackAlias */,
+    const folly::Optional<TrackAlias>& /* trackAlias */,
     const ObjectHeader& objHeader,
     Payload payload) {
   XLOG(DBG1) << "MoQTest DEBUGGING: Calling onObject";
@@ -161,7 +163,7 @@ ObjectReceiverCallback::FlowControlState MoQTestClient::onObject(
 }
 
 void MoQTestClient::onObjectStatus(
-    folly::Optional<TrackAlias> /* trackAlias */,
+    const folly::Optional<TrackAlias>& /* trackAlias */,
     const ObjectHeader& objHeader) {
   XLOG(DBG1) << "MoQTest DEBUGGING: calling onObjectStatus";
 
@@ -201,7 +203,7 @@ void MoQTestClient::onEndOfStream() {
 void MoQTestClient::onError(ResetStreamErrorCode) {
   XLOG(DBG1) << "MoQTest DEBUGGING: calling onError";
 }
-void MoQTestClient::onSubscribeDone(SubscribeDone done) {
+void MoQTestClient::onSubscribeDone(const SubscribeDone& done) {
   XLOG(DBG1) << "MoQTest DEBUGGING: onSubscribeDone";
 
   if (params_.forwardingPreference == ForwardingPreference::DATAGRAM) {
@@ -507,61 +509,8 @@ bool MoQTestClient::validateDatagramObjects(const ObjectHeader& header) {
   return true;
 }
 
-void MoQTestClient::goaway(Goaway goaway) {
-  XLOG(DBG1) << "MoQTest DEBUGGING: calling goaway";
-  moqClient_->goaway(goaway);
-};
-
-void MoQTestClient::announceCancel(
-    AnnounceErrorCode errorCode,
-    std::string reasonPhrase) {
-  if (announceCallback_) {
-    announceCallback_->announceCancel(errorCode, std::move(reasonPhrase));
-  }
-}
-
-folly::coro::Task<MoQSession::AnnounceResult> MoQTestClient::announce(
-    Announce ann,
-    std::shared_ptr<AnnounceCallback> callback) {
-  LOG(INFO) << "MoQTest DEBUGGING: calling announce";
-  auto track = convertMoqTestParamToTrackNamespace(&params_);
-
-  if (callback) {
-    announceCallback_ = callback;
-  }
-
-  if (track.hasError()) {
-    AnnounceError error{
-        requestID_,
-        AnnounceErrorCode::INTERNAL_ERROR,
-        "Parameters couldn't be converted to TrackNamespace"};
-    co_return folly::makeUnexpected(error);
-  }
-
-  AnnounceOk ok = {
-      requestID_,
-      {},
-  };
-  co_return std::make_shared<AnnounceHandle>(ok);
-}
-
 folly::coro::Task<void> MoQTestClient::trackStatus(TrackStatus req) {
   co_await moqClient_->moqSession_->trackStatus(req);
 }
 
-folly::coro::Task<Publisher::SubscribeAnnouncesResult>
-MoQTestClient::subscribeAnnounces(SubscribeAnnounces ann) {
-  auto res = co_await moqClient_->moqSession_->subscribeAnnounces(ann);
-  if (res.hasValue()) {
-    subAnnouncesHandle_ = res.value();
-  }
-  co_return res;
-}
-
-void MoQTestClient::unsubscribeAnnounces(UnsubscribeAnnounces unann) {
-  if (subAnnouncesHandle_) {
-    subAnnouncesHandle_->unsubscribeAnnounces();
-  }
-}
-
 } // namespace moxygen

moxygen/moqtest/MoQTestClient.h

@@ -40,13 +40,11 @@ enum AdjustedExpectedResult : int {
   ERROR_RECEIVING_DATA = 2
 };
 
-class MoQTestClient : public moxygen::Subscriber,
-                      public std::enable_shared_from_this<MoQTestClient>,
-                      public ObjectReceiverCallback {
+class MoQTestClient {
  public:
   MoQTestClient(folly::EventBase* evb, proxygen::URL url);
 
-  ~MoQTestClient() override {}
+  ~MoQTestClient() {}
 
   MoQTestClient(const MoQTestClient&) = delete;
   MoQTestClient& operator=(const MoQTestClient&) = delete;
@@ -62,39 +60,66 @@ class MoQTestClient : public moxygen::Subscriber,
 
   folly::coro::Task<moxygen::TrackNamespace> fetch(MoQTestParameters params);
 
-  // Override Vritual Functions for now to return basic print statements
-  virtual FlowControlState onObject(
-      folly::Optional<TrackAlias> trackAlias,
-      const ObjectHeader& objHeader,
-      Payload payload) override;
-  virtual void onObjectStatus(
-      folly::Optional<TrackAlias> trackAlias,
-      const ObjectHeader& objHeader) override;
-  virtual void onEndOfStream() override;
-  virtual void onError(ResetStreamErrorCode) override;
-  virtual void onSubscribeDone(SubscribeDone done) override;
-
   void setLogger(const std::shared_ptr<MLogger>& logger);
 
-  virtual void goaway(Goaway goaway) override;
-  virtual folly::coro::Task<AnnounceResult> announce(
-      Announce ann,
-      std::shared_ptr<AnnounceCallback> callback = nullptr) override;
-
   folly::coro::Task<void> trackStatus(TrackStatus req);
   void subscribeUpdate(SubscribeUpdate update);
-  folly::coro::Task<Publisher::SubscribeAnnouncesResult> subscribeAnnounces(
-      SubscribeAnnounces announces);
-  void unsubscribeAnnounces(UnsubscribeAnnounces unann);
-
-  void announceCancel(AnnounceErrorCode errorCode, std::string reasonPhrase);
 
  private:
+  // An ObjectReceiverCallback implementation that forwards calls to a
+  // MoQTestClient.
+  class ObjectReceiverCallback : public moxygen::ObjectReceiverCallback {
+   public:
+    explicit ObjectReceiverCallback(MoQTestClient& client) : client_(client) {}
+
+    FlowControlState onObject(
+        folly::Optional<TrackAlias> trackAlias,
+        const ObjectHeader& objHeader,
+        Payload payload) override {
+      return client_.onObject(
+          std::move(trackAlias), objHeader, std::move(payload));
+    }
+
+    void onObjectStatus(
+        folly::Optional<TrackAlias> trackAlias,
+        const ObjectHeader& objHeader) override {
+      client_.onObjectStatus(std::move(trackAlias), objHeader);
+    }
+
+    void onEndOfStream() override {
+      client_.onEndOfStream();
+    }
+
+    void onError(ResetStreamErrorCode code) override {
+      client_.onError(code);
+    }
+
+    void onSubscribeDone(SubscribeDone done) override {
+      client_.onSubscribeDone(std::move(done));
+    }
+
+   private:
+    MoQTestClient& client_;
+  };
+
+  // Override Vritual Functions for now to return basic print statements
+  ObjectReceiverCallback::FlowControlState onObject(
+      const folly::Optional<TrackAlias>& trackAlias,
+      const ObjectHeader& objHeader,
+      Payload payload);
+  void onObjectStatus(
+      const folly::Optional<TrackAlias>& trackAlias,
+      const ObjectHeader& objHeader);
+  void onEndOfStream();
+  void onError(ResetStreamErrorCode);
+  void onSubscribeDone(const SubscribeDone& done);
+
+  ObjectReceiverCallback objectReceiverCallback_{*this};
+
   std::shared_ptr<MoQFollyExecutorImpl> moqExecutor_;
   std::unique_ptr<MoQClient> moqClient_;
   std::shared_ptr<ObjectReceiver> subReceiver_;
   std::shared_ptr<ObjectReceiver> fetchReceiver_;
-  std::shared_ptr<AnnounceCallback> announceCallback_;
 
   // Holds Current Request Parameters
   ReceivingType receivingType_ = ReceivingType::UNKNOWN_RECEIVING_TYPE;
@@ -117,7 +142,6 @@ class MoQTestClient : public moxygen::Subscriber,
   // Handles
   std::shared_ptr<Publisher::SubscriptionHandle> subHandle_;
   std::shared_ptr<Publisher::FetchHandle> fetchHandle_;
-  std::shared_ptr<Publisher::SubscribeAnnouncesHandle> subAnnouncesHandle_;
 
   // Subscription Data Validation functions
   void initializeExpecteds(MoQTestParameters& params);