Obsolete commands: base58check-*, seed, wrap-* (to be replaced).

Author: evoskuil

include/bitcoin/explorer/commands/base58check-decode.hpp

@@ -50,6 +50,12 @@ namespace libbitcoin {
 namespace explorer {
 namespace commands {
 
+/**
+ * Various localizable strings.
+ */
+#define BX_BASE58CHECK_DECODE_OBSOLETE \
+    "This command is obsolete. Use combination of checked-encode and base58-encode instead."
+
 /**
  * Class to implement the base58check-decode command.
  */
@@ -97,15 +103,23 @@ class BCX_API base58check_decode
         return "Convert a Base58Check value to its component parts.";
     }
 
+    /**
+     * Declare whether the command has been obsoleted.
+     * @return  True if the command is obsolete
+     */
+    virtual bool obsolete()
+    {
+        return true;
+    }
+
     /**
      * Load program argument definitions.
      * A value of -1 indicates that the number of instances is unlimited.
      * @return  The loaded program argument definitions.
      */
     virtual system::arguments_metadata& load_arguments()
     {
-        return get_argument_metadata()
-            .add("BASE58CHECK", 1);
+        return get_argument_metadata();
     }
 
     /**
@@ -116,8 +130,6 @@ class BCX_API base58check_decode
     virtual void load_fallbacks(std::istream& input,
         po::variables_map& variables)
     {
-        const auto raw = requires_raw_input();
-        load_input(get_base58check_argument(), "BASE58CHECK", variables, input, raw);
     }
 
     /**
@@ -139,16 +151,6 @@ class BCX_API base58check_decode
             BX_CONFIG_VARIABLE ",c",
             value<boost::filesystem::path>(),
             "The path to the configuration settings file."
-        )
-        (
-            "format,f",
-            value<explorer::config::encoding>(&option_.format),
-            "The output format. Options are 'info', 'json' and 'xml', defaults to 'info'."
-        )
-        (
-            "BASE58CHECK",
-            value<system::config::base58>(&argument_.base58check),
-            "The Base58Check value to decode. If not specified the value is read from STDIN."
         );
 
         return options;
@@ -173,40 +175,6 @@ class BCX_API base58check_decode
 
     /* Properties */
 
-    /**
-     * Get the value of the BASE58CHECK argument.
-     */
-    virtual system::config::base58& get_base58check_argument()
-    {
-        return argument_.base58check;
-    }
-
-    /**
-     * Set the value of the BASE58CHECK argument.
-     */
-    virtual void set_base58check_argument(
-        const system::config::base58& value)
-    {
-        argument_.base58check = value;
-    }
-
-    /**
-     * Get the value of the format option.
-     */
-    virtual explorer::config::encoding& get_format_option()
-    {
-        return option_.format;
-    }
-
-    /**
-     * Set the value of the format option.
-     */
-    virtual void set_format_option(
-        const explorer::config::encoding& value)
-    {
-        option_.format = value;
-    }
-
 private:
 
     /**
@@ -217,11 +185,9 @@ class BCX_API base58check_decode
     struct argument
     {
         argument()
-          : base58check()
         {
         }
 
-        system::config::base58 base58check;
     } argument_;
 
     /**
@@ -232,11 +198,9 @@ class BCX_API base58check_decode
     struct option
     {
         option()
-          : format()
         {
         }
 
-        explorer::config::encoding format;
     } option_;
 };
 

include/bitcoin/explorer/commands/base58check-encode.hpp

@@ -50,6 +50,12 @@ namespace libbitcoin {
 namespace explorer {
 namespace commands {
 
+/**
+ * Various localizable strings.
+ */
+#define BX_BASE58CHECK_ENCODE_OBSOLETE \
+    "This command is obsolete. Use combination of base58-encode and checked-decode instead."
+
 /**
  * Class to implement the base58check-encode command.
  */
@@ -97,15 +103,23 @@ class BCX_API base58check_encode
         return "Convert a Base16 value to Base58Check.";
     }
 
+    /**
+     * Declare whether the command has been obsoleted.
+     * @return  True if the command is obsolete
+     */
+    virtual bool obsolete()
+    {
+        return true;
+    }
+
     /**
      * Load program argument definitions.
      * A value of -1 indicates that the number of instances is unlimited.
      * @return  The loaded program argument definitions.
      */
     virtual system::arguments_metadata& load_arguments()
     {
-        return get_argument_metadata()
-            .add("BASE16", 1);
+        return get_argument_metadata();
     }
 
     /**
@@ -116,8 +130,6 @@ class BCX_API base58check_encode
     virtual void load_fallbacks(std::istream& input,
         po::variables_map& variables)
     {
-        const auto raw = requires_raw_input();
-        load_input(get_base16_argument(), "BASE16", variables, input, raw);
     }
 
     /**
@@ -139,16 +151,6 @@ class BCX_API base58check_encode
             BX_CONFIG_VARIABLE ",c",
             value<boost::filesystem::path>(),
             "The path to the configuration settings file."
-        )
-        (
-            "version,v",
-            value<explorer::config::byte>(&option_.version)->default_value(0),
-            "The desired version number."
-        )
-        (
-            "BASE16",
-            value<system::config::base16>(&argument_.base16),
-            "The Base16 value to Base58Check encode. If not specified the value is read from STDIN."
         );
 
         return options;
@@ -160,12 +162,6 @@ class BCX_API base58check_encode
      */
     virtual void set_defaults_from_config(po::variables_map& variables)
     {
-        const auto& option_version = variables["version"];
-        const auto& option_version_config = variables["wallet.pay_to_public_key_hash_version"];
-        if (option_version.defaulted() && !option_version_config.defaulted())
-        {
-            option_.version = option_version_config.as<explorer::config::byte>();
-        }
     }
 
     /**
@@ -179,40 +175,6 @@ class BCX_API base58check_encode
 
     /* Properties */
 
-    /**
-     * Get the value of the BASE16 argument.
-     */
-    virtual system::config::base16& get_base16_argument()
-    {
-        return argument_.base16;
-    }
-
-    /**
-     * Set the value of the BASE16 argument.
-     */
-    virtual void set_base16_argument(
-        const system::config::base16& value)
-    {
-        argument_.base16 = value;
-    }
-
-    /**
-     * Get the value of the version option.
-     */
-    virtual explorer::config::byte& get_version_option()
-    {
-        return option_.version;
-    }
-
-    /**
-     * Set the value of the version option.
-     */
-    virtual void set_version_option(
-        const explorer::config::byte& value)
-    {
-        option_.version = value;
-    }
-
 private:
 
     /**
@@ -223,11 +185,9 @@ class BCX_API base58check_encode
     struct argument
     {
         argument()
-          : base16()
         {
         }
 
-        system::config::base16 base16;
     } argument_;
 
     /**
@@ -238,11 +198,9 @@ class BCX_API base58check_encode
     struct option
     {
         option()
-          : version()
         {
         }
 
-        explorer::config::byte version;
     } option_;
 };
 

include/bitcoin/explorer/commands/seed.hpp

@@ -53,8 +53,8 @@ namespace commands {
 /**
  * Various localizable strings.
  */
-#define BX_SEED_BIT_LENGTH_UNSUPPORTED \
-    "The seed size is not supported."
+#define BX_SEED_OBSOLETE \
+    "This command is obsolete. Use the entropy command instead."
 
 /**
  * Class to implement the seed command.
@@ -103,6 +103,15 @@ class BCX_API seed
         return "Generate a pseudorandom seed.";
     }
 
+    /**
+     * Declare whether the command has been obsoleted.
+     * @return  True if the command is obsolete
+     */
+    virtual bool obsolete()
+    {
+        return true;
+    }
+
     /**
      * Load program argument definitions.
      * A value of -1 indicates that the number of instances is unlimited.
@@ -142,11 +151,6 @@ class BCX_API seed
             BX_CONFIG_VARIABLE ",c",
             value<boost::filesystem::path>(),
             "The path to the configuration settings file."
-        )
-        (
-            "bit_length,b",
-            value<uint16_t>(&option_.bit_length)->default_value(192),
-            "The length of the seed in bits. Must be divisible by 8 and must not be less than 128, defaults to 192."
         );
 
         return options;
@@ -171,23 +175,6 @@ class BCX_API seed
 
     /* Properties */
 
-    /**
-     * Get the value of the bit_length option.
-     */
-    virtual uint16_t& get_bit_length_option()
-    {
-        return option_.bit_length;
-    }
-
-    /**
-     * Set the value of the bit_length option.
-     */
-    virtual void set_bit_length_option(
-        const uint16_t& value)
-    {
-        option_.bit_length = value;
-    }
-
 private:
 
     /**
@@ -211,11 +198,9 @@ class BCX_API seed
     struct option
     {
         option()
-          : bit_length()
         {
         }
 
-        uint16_t bit_length;
     } option_;
 };