From aeb35664fc6d1c38c9c0f34c4489156b05a46fc6 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Mon, 29 Apr 2019 07:24:43 +0800
Subject: [PATCH] batch_import_test.py updated

---
 scripts/batch_import_test.py |  5 ++++-
 src/OpenMoneroRequests.cpp   | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/batch_import_test.py b/scripts/batch_import_test.py
index 7a15f2e..be3b4a2 100644
--- a/scripts/batch_import_test.py
+++ b/scripts/batch_import_test.py
@@ -46,7 +46,10 @@ class OpenMonero:
         return await make_request(om_url+"get_version")
 
     async def login(self):
-        return await make_request(self.url+"login", self.payload)
+        payload = dict(self.payload, 
+                **{"create_account":False,
+                   "generated_locally":False})
+        return await make_request(self.url+"login", payload)
        
     async def import_recent_wallet(self, no_blocks=100000):
         payload = dict(self.payload, 
diff --git a/src/OpenMoneroRequests.cpp b/src/OpenMoneroRequests.cpp
index a30e435..08cc8f2 100755
--- a/src/OpenMoneroRequests.cpp
+++ b/src/OpenMoneroRequests.cpp
@@ -76,7 +76,7 @@ OpenMoneroRequests::login(const shared_ptr<Session> session, const Bytes & body)
     }
     catch (json::exception const& e)
     {
-        cerr << "json exception: " << e.what() << '\n';
+        OMERROR << "json exception: " << e.what();
         session_close(session, j_response);
         return;
     }
@@ -400,7 +400,7 @@ OpenMoneroRequests::get_address_info(
     }
     catch (json::exception const& e)
     {
-        cerr << "json exception: " << e.what() << '\n';
+        OMERROR << "json exception: " << e.what();
         session_close(session, j_response);
         return;
     }
@@ -580,13 +580,13 @@ OpenMoneroRequests::get_unspent_outs(
     }
     catch (json::exception const& e)
     {
-        cerr << "json exception: " << e.what() << '\n';
+        OMERROR << "json exception: " << e.what();
         session_close(session, j_response);
         return;
     }
     catch (boost::bad_lexical_cast const& e)
     {
-        cerr << "Bed lexical cast" << e.what() << '\n';
+        OMERROR << "Bed lexical cast" << e.what() << '\n';
         session_close(session, j_response);
         return;
     }
@@ -815,14 +815,14 @@ OpenMoneroRequests::get_random_outs(
     }
     catch (json::exception const& e)
     {
-        cerr << "json exception: " << e.what() << '\n';
+        OMERROR << "json exception: " << e.what();
         session_close(session, j_response);
         return;
     };
 
     if (count > 41)
     {
-        cerr << "Request ring size too big" << '\n';
+        OMERROR << "Request ring size too big" << '\n';
         j_response["status"] = "error";
         j_response["error"]  = "Request ring size too large";
         session_close(session, j_response);
@@ -844,7 +844,7 @@ OpenMoneroRequests::get_random_outs(
     }
     catch (boost::bad_lexical_cast& e)
     {
-        cerr << "Bed lexical cast" << '\n';
+        OMERROR << "Bed lexical cast";
         session_close(session, j_response);
         return;
     }