commit c87d52b84da8e12d9723975327f200b313f4b0fe
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 22:07:18 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 22:07:18 2020 -0700
tree 9306c1125fbd7959d8d014f3a928fbdb3dd547f8
parent c84c3bafe7ae1635de93651f9503b6bfc7c2d808

merge two onInterest callback into one

Change-Id: I82e8150239d795cb465ea2526624300590e4434c

src/certificate-request.hpp

diff --git a/src/certificate-request.hpp b/src/certificate-request.hpp
index bed7660..55b90c8 100644
--- a/src/certificate-request.hpp
+++ b/src/certificate-request.hpp
@@ -32,12 +32,6 @@
 
 typedef boost::property_tree::ptree JsonSection;
 
-//Request Type Enum
-enum {
-    REQUEST_TYPE_NEW = 0,
-    REQUEST_TYPE_REVOKE = 1
-};
-
 /**
  * @brief Represents a certificate request instance.
  *
@@ -45,13 +39,12 @@
  * m_challengeDefinedField to finish verification.
  *
  */
-class CertificateRequest
-{
+class CertificateRequest {
 public:
   CertificateRequest();
-  CertificateRequest(const Name& caName, const std::string& requestId, int requestType, Status status,
+  CertificateRequest(const Name& caName, const std::string& requestId, RequestType requestType, Status status,
                      const security::v2::Certificate& cert);
-  CertificateRequest(const Name& caName, const std::string& requestId, int requestType, Status status,
+  CertificateRequest(const Name& caName, const std::string& requestId, RequestType requestType, Status status,
                      const std::string& challengeStatus, const std::string& challengeType,
                      const std::string& challengeTp, int remainingTime, int remainingTries,
                      const JsonSection& challengeSecrets, const security::v2::Certificate& cert);
@@ -62,7 +55,7 @@
 public:
   Name m_caPrefix;
   std::string m_requestId = "";
-  int m_requestType = -1;
+  RequestType m_requestType = RequestType::NOTINITIALIZED;
   Status m_status = Status::NOT_STARTED;
   security::v2::Certificate m_cert;
   std::shared_ptr<Data> m_probeToken = nullptr;
@@ -78,7 +71,7 @@
 std::ostream&
 operator<<(std::ostream& os, const CertificateRequest& request);
 
-} // namespace ndncert
-} // namespace ndn
+}  // namespace ndncert
+}  // namespace ndn
 
-#endif // NDNCERT_CERTIFICATE_REQUEST_HPP
+#endif  // NDNCERT_CERTIFICATE_REQUEST_HPP