From 6752d943ef0928fb883368a473048d9d3c741371 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Fri, 26 Jul 2019 16:26:32 -0400
Subject: [PATCH] catchunks: remove previously deprecated options

Change-Id: I0a7154dfd8879337f40524261fc854807dbc3d22
---
 tools/chunks/catchunks/main.cpp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/tools/chunks/catchunks/main.cpp b/tools/chunks/catchunks/main.cpp
index a24d39e..82d10c8 100644
--- a/tools/chunks/catchunks/main.cpp
+++ b/tools/chunks/catchunks/main.cpp
@@ -132,17 +132,12 @@ main(int argc, char* argv[])
   hiddenDesc.add_options()
     ("ndn-name,n", po::value<std::string>(&uri), "NDN name of the requested content");
 
-  po::options_description deprecatedDesc;
-  deprecatedDesc.add_options()
-    ("discover-version,d", po::value<std::string>(), "version discovery algorithm to use")
-    ("discovery-timeout,t", po::value<int64_t>(), "discovery timeout (in milliseconds)");
+  po::options_description optDesc;
+  optDesc.add(visibleDesc).add(hiddenDesc);
 
   po::positional_options_description p;
   p.add("ndn-name", -1);
 
-  po::options_description optDesc;
-  optDesc.add(visibleDesc).add(hiddenDesc).add(deprecatedDesc);
-
   po::variables_map vm;
   try {
     po::store(po::command_line_parser(argc, argv).options(optDesc).positional(p).run(), vm);
@@ -163,14 +158,6 @@ main(int argc, char* argv[])
     return 0;
   }
 
-  if (vm.count("discover-version") > 0) {
-    std::cerr << "WARNING: -d option is deprecated and will be removed in the near future" << std::endl;
-  }
-
-  if (vm.count("discovery-timeout") > 0) {
-    std::cerr << "WARNING: -t option is deprecated and will be removed in the near future" << std::endl;
-  }
-
   if (vm.count("version") > 0) {
     std::cout << "ndncatchunks " << tools::VERSION << std::endl;
     return 0;