1 files changed, 19 insertions, 61 deletions
diff --git a/tests/fuzz/cold-outputs.cpp b/tests/fuzz/cold-outputs.cpp
index f4050c948..ce6d6640c 100644
--- a/tests/fuzz/cold-outputs.cpp
+++ b/tests/fuzz/cold-outputs.cpp
@@ -34,70 +34,28 @@
 #include "wallet/wallet2.h"
 #include "fuzzer.h"
 
-class ColdOutputsFuzzer: public Fuzzer
-{
-public:
-  ColdOutputsFuzzer(): wallet(cryptonote::TESTNET) {}
-  virtual int init();
-  virtual int run(const std::string &filename);
+static tools::wallet2 *wallet = NULL;
 
-private:
-  tools::wallet2 wallet;
-};
+BEGIN_INIT_SIMPLE_FUZZER()
+  static tools::wallet2 local_wallet;
+  wallet = &local_wallet;
 
-int ColdOutputsFuzzer::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);
-  }
-  catch (const std::exception &e)
-  {
-    std::cerr << "Error on ColdOutputsFuzzer::init: " << e.what() << std::endl;
-    return 1;
-  }
-  return 0;
-}
-
-int ColdOutputsFuzzer::run(const std::string &filename)
-{
-  std::string s;
-
-  if (!epee::file_io_utils::load_file_to_string(filename, s))
-  {
-    std::cout << "Error: failed to load file " << filename << std::endl;
-    return 1;
-  }
-  s = std::string("\x01\x16serialization::archive") + s;
-  try
-  {
-    std::pair<size_t, std::vector<tools::wallet2::transfer_details>> outputs;
-    std::stringstream iss;
-    iss << s;
-    boost::archive::portable_binary_iarchive ar(iss);
-    ar >> outputs;
-    size_t n_outputs = wallet.import_outputs(outputs);
-    std::cout << boost::lexical_cast<std::string>(n_outputs) << " outputs imported" << std::endl;
-  }
-  catch (const std::exception &e)
-  {
-    std::cerr << "Failed to import outputs: " << e.what() << std::endl;
-    return 1;
-  }
-  return 0;
-}
-
-int main(int argc, const char **argv)
-{
-  TRY_ENTRY();
-  ColdOutputsFuzzer fuzzer;
-  return run_fuzzer(argc, argv, fuzzer);
-  CATCH_ENTRY_L0("main", 1);
-}
-
+  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);
+END_INIT_SIMPLE_FUZZER()
+
+BEGIN_SIMPLE_FUZZER()
+  std::string s = std::string("\x01\x16serialization::archive") + std::string((const char*)buf, len);
+  std::pair<size_t, std::vector<tools::wallet2::transfer_details>> outputs;
+  std::stringstream iss;
+  iss << s;
+  boost::archive::portable_binary_iarchive ar(iss);
+  ar >> outputs;
+  size_t n_outputs = wallet->import_outputs(outputs);
+  std::cout << boost::lexical_cast<std::string>(n_outputs) << " outputs imported" << std::endl;
+END_SIMPLE_FUZZER()