1 files changed, 16 insertions, 51 deletions
diff --git a/tests/fuzz/signature.cpp b/tests/fuzz/signature.cpp
index 038378ae2..3743cfdd0 100644
--- a/tests/fuzz/signature.cpp
+++ b/tests/fuzz/signature.cpp
@@ -34,66 +34,31 @@
 #include "wallet/wallet2.h"
 #include "fuzzer.h"
 
-class SignatureFuzzer: public Fuzzer
-{
-public:
-  SignatureFuzzer(): Fuzzer(), wallet(cryptonote::TESTNET) {}
-  virtual int init();
-  virtual int run(const std::string &filename);
+static tools::wallet2 *wallet = NULL;
+static cryptonote::account_public_address address;
 
-private:
-  tools::wallet2 wallet;
-  cryptonote::account_public_address address;
-};
+BEGIN_INIT_SIMPLE_FUZZER()
+  static tools::wallet2 local_wallet(cryptonote::TESTNET);
+  wallet = &local_wallet;
 
-int SignatureFuzzer::init()
-{
   static const char * const spendkey_hex = "0b4f47697ec99c3de6579304e5f25c68b07afbe55b71d99620bf6cbf4e45a80f";
   crypto::secret_key spendkey;
   epee::string_tools::hex_to_pod(spendkey_hex, spendkey);
 
-  try
-  {
-    wallet.init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
-    wallet.set_subaddress_lookahead(1, 1);
-    wallet.generate("", "", spendkey, true, false);
+  wallet->init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
+  wallet->set_subaddress_lookahead(1, 1);
+  wallet->generate("", "", spendkey, true, false);
 
-    cryptonote::address_parse_info info;
-    if (!cryptonote::get_account_address_from_str_or_url(info, cryptonote::TESTNET, "9uVsvEryzpN8WH2t1WWhFFCG5tS8cBNdmJYNRuckLENFimfauV5pZKeS1P2CbxGkSDTUPHXWwiYE5ZGSXDAGbaZgDxobqDN"))
-    {
-      std::cerr << "failed to parse address" << std::endl;
-      return 1;
-    }
-    address = info.address;
-  }
-  catch (const std::exception &e)
+  cryptonote::address_parse_info info;
+  if (!cryptonote::get_account_address_from_str_or_url(info, cryptonote::TESTNET, "9uVsvEryzpN8WH2t1WWhFFCG5tS8cBNdmJYNRuckLENFimfauV5pZKeS1P2CbxGkSDTUPHXWwiYE5ZGSXDAGbaZgDxobqDN"))
   {
-    std::cerr << "Error on SignatureFuzzer::init: " << e.what() << std::endl;
+    std::cerr << "failed to parse address" << std::endl;
     return 1;
   }
-  return 0;
-}
-
-int SignatureFuzzer::run(const std::string &filename)
-{
-  std::string s;
+  address = info.address;
+END_INIT_SIMPLE_FUZZER()
 
-  if (!epee::file_io_utils::load_file_to_string(filename, s))
-  {
-    std::cout << "Error: failed to load file " << filename << std::endl;
-    return 1;
-  }
-
-  bool valid = wallet.verify("test", address, s);
+BEGIN_SIMPLE_FUZZER()
+  bool valid = wallet->verify("test", address, std::string((const char*)buf, len));
   std::cout << "Signature " << (valid ? "valid" : "invalid") << std::endl;
-
-  return 0;
-}
-
-int main(int argc, const char **argv)
-{
-  TRY_ENTRY();
-  SignatureFuzzer fuzzer;
-  return run_fuzzer(argc, argv, fuzzer);
-  CATCH_ENTRY_L0("main", 1);
-}
+END_SIMPLE_FUZZER()