commit d4e8ce5f39cd0f2090176373e2c310ec70bbb92a
author Yumin Xia <me@yumin-xia.com> Fri Mar 17 19:56:52 2017 -0700
committer Yumin Xia <me@yumin-xia.com> Mon Oct 16 12:47:33 2017 -0700
tree 4b5c806ff7a1bb5ed82dafecacbc717f54ae8935
parent 953293393f53833c56d1f341c379261befc1f05f

drop repeating record type generate*Rrset in rrset-factory

Change-Id: I64f18cb5f08febbbeccaa66b10b7a46a06a4bc76

src/daemon/rrset-factory.cpp

diff --git a/src/daemon/rrset-factory.cpp b/src/daemon/rrset-factory.cpp
index f82e831..4351fcd 100644
--- a/src/daemon/rrset-factory.cpp
+++ b/src/daemon/rrset-factory.cpp
@@ -117,7 +117,6 @@
 
 Rrset
 RrsetFactory::generateNsRrset(const Name& label,
-                              const name::Component& type,
                               const uint64_t version,
                               time::seconds ttl,
                               const ndn::DelegationList& delegations)
@@ -129,7 +128,7 @@
   if (ttl == DEFAULT_RR_TTL)
     ttl = m_zone.getTtl();
 
-  std::pair<Rrset, Name> rrsetAndName = generateBaseRrset(label, type, version, ttl);
+  std::pair<Rrset, Name> rrsetAndName = generateBaseRrset(label, label::NS_RR_TYPE, version, ttl);
   const Name& name = rrsetAndName.second;
   Rrset& rrset = rrsetAndName.first;
 
@@ -145,7 +144,6 @@
 
 Rrset
 RrsetFactory::generateTxtRrset(const Name& label,
-                               const name::Component& type,
                                const uint64_t version,
                                time::seconds ttl,
                                const std::vector<std::string>& strings)
@@ -159,7 +157,7 @@
 
   Name name;
   Rrset rrset;
-  std::tie(rrset, name) = generateBaseRrset(label, type, version, ttl);
+  std::tie(rrset, name) = generateBaseRrset(label, label::TXT_RR_TYPE, version, ttl);
 
   std::vector<Block> rrs;
   for (const auto& item : strings) {
@@ -180,7 +178,6 @@
 
 Rrset
 RrsetFactory::generateCertRrset(const Name& label,
-                                const name::Component& type,
                                 const uint64_t version,
                                 time::seconds ttl,
                                 const ndn::security::v2::Certificate& cert)
@@ -194,7 +191,7 @@
 
   Name name;
   Rrset rrset;
-  std::tie(rrset, name) = generateBaseRrset(label, type, version, ttl);
+  std::tie(rrset, name) = generateBaseRrset(label, label::APPCERT_RR_TYPE, version, ttl);
 
   Data data(name);
   data.setContent(cert.wireEncode());
@@ -208,7 +205,6 @@
 
 Rrset
 RrsetFactory::generateAuthRrset(const Name& label,
-                                const name::Component& type,
                                 const uint64_t version,
                                 time::seconds ttl)
 {
@@ -221,7 +217,7 @@
 
   Name name;
   Rrset rrset;
-  std::tie(rrset, name) = generateBaseRrset(label, type, version, ttl);
+  std::tie(rrset, name) = generateBaseRrset(label, label::NS_RR_TYPE, version, ttl);
 
   Data data(name);