From a5b3818a231b5207b94804d0b54aa6009e29a5ed Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Wed, 29 Mar 2017 14:40:21 +0800
Subject: [PATCH] simplify main.cpp by adding MAKE_RESOURCE macro

---
 main.cpp                 | 42 +++++++++++-----------------------------
 src/YourMoneroRequests.h |  5 +++++
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/main.cpp b/main.cpp
index 9116de7..4a02a52 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,7 @@
 #include <memory>
 #include <cstdlib>
 
+
 using namespace std;
 using namespace restbed;
 
@@ -155,42 +156,21 @@ xmreg::YourMoneroRequests::frontend_url
 xmreg::YourMoneroRequests open_monero(
         shared_ptr<xmreg::MySqlAccounts>(new xmreg::MySqlAccounts{}));
 
-auto login                 = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::login,
-        "/login");
-
-auto get_address_txs       = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::get_address_txs,
-        "/get_address_txs");
-
-auto get_address_info      = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::get_address_info,
-        "/get_address_info");
-
-auto get_unspent_outs      = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::get_unspent_outs,
-        "/get_unspent_outs");
-
-auto get_random_outs       = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::get_random_outs,
-        "/get_random_outs");
-
-auto submit_raw_tx         = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::submit_raw_tx,
-        "/submit_raw_tx");
-
-auto import_wallet_request = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::import_wallet_request,
-        "/import_wallet_request");
+// create Open Monero APIs
+MAKE_RESOURCE(login);
+MAKE_RESOURCE(get_address_txs);
+MAKE_RESOURCE(get_address_info);
+MAKE_RESOURCE(get_unspent_outs);
+MAKE_RESOURCE(get_random_outs);
+MAKE_RESOURCE(submit_raw_tx);
+MAKE_RESOURCE(import_wallet_request);
+MAKE_RESOURCE(get_version);
 
-auto get_version           = open_monero.make_resource(
-        &xmreg::YourMoneroRequests::get_version,
-        "/get_version");
 
 // restbed service
 Service service;
 
-// Open Monero API we publish to the frontend
+// Publish the Open Monero API created so that front end can use it
 service.publish(login);
 service.publish(get_address_txs);
 service.publish(get_address_info);
diff --git a/src/YourMoneroRequests.h b/src/YourMoneroRequests.h
index 88498c8..13d15f0 100644
--- a/src/YourMoneroRequests.h
+++ b/src/YourMoneroRequests.h
@@ -16,6 +16,11 @@
 
 #include "../ext/restbed/source/restbed"
 
+#ifndef MAKE_RESOURCE
+#define MAKE_RESOURCE(name) auto name = open_monero.make_resource( \
+                           &xmreg::YourMoneroRequests::name, "/" + string(#name));
+#endif
+
 namespace xmreg
 {