aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/epee/include/serialization/keyvalue_serialization.h2
-rw-r--r--src/rpc/core_rpc_server_commands_defs.h40
-rw-r--r--src/wallet/message_transporter.cpp2
-rw-r--r--src/wallet/wallet_rpc_server_commands_defs.h140
-rw-r--r--tests/unit_tests/net.cpp4
5 files changed, 94 insertions, 94 deletions
diff --git a/contrib/epee/include/serialization/keyvalue_serialization.h b/contrib/epee/include/serialization/keyvalue_serialization.h
index 06d74329f..ea767865c 100644
--- a/contrib/epee/include/serialization/keyvalue_serialization.h
+++ b/contrib/epee/include/serialization/keyvalue_serialization.h
@@ -105,7 +105,7 @@ public: \
#define KV_SERIALIZE_VAL_POD_AS_BLOB_OPT_N(varialble, val_name, default_value) \
do { \
static_assert(std::is_pod<decltype(this_ref.varialble)>::value, "t_type must be a POD type."); \
- bool ret = KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(varialble, val_name); \
+ bool ret = KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(varialble, val_name) \
if (!ret) \
epee::serialize_default(this_ref.varialble, default_value); \
} while(0);
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 37f9b8f2f..c0330eed9 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -617,7 +617,7 @@ namespace cryptonote
bool do_sanity_checks;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_PARENT(rpc_access_request_base);
+ KV_SERIALIZE_PARENT(rpc_access_request_base)
KV_SERIALIZE(tx_as_hex)
KV_SERIALIZE_OPT(do_not_relay, false)
KV_SERIALIZE_OPT(do_sanity_checks, true)
@@ -693,7 +693,7 @@ namespace cryptonote
struct request_t: public rpc_access_request_base
{
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_PARENT(rpc_access_request_base);
+ KV_SERIALIZE_PARENT(rpc_access_request_base)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1217,7 +1217,7 @@ namespace cryptonote
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_PARENT(rpc_access_request_base)
- KV_SERIALIZE_OPT(fill_pow_hash, false);
+ KV_SERIALIZE_OPT(fill_pow_hash, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1247,7 +1247,7 @@ namespace cryptonote
KV_SERIALIZE_PARENT(rpc_access_request_base)
KV_SERIALIZE(hash)
KV_SERIALIZE(hashes)
- KV_SERIALIZE_OPT(fill_pow_hash, false);
+ KV_SERIALIZE_OPT(fill_pow_hash, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1276,7 +1276,7 @@ namespace cryptonote
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_PARENT(rpc_access_request_base)
KV_SERIALIZE(height)
- KV_SERIALIZE_OPT(fill_pow_hash, false);
+ KV_SERIALIZE_OPT(fill_pow_hash, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1305,7 +1305,7 @@ namespace cryptonote
KV_SERIALIZE_PARENT(rpc_access_request_base)
KV_SERIALIZE(hash)
KV_SERIALIZE(height)
- KV_SERIALIZE_OPT(fill_pow_hash, false);
+ KV_SERIALIZE_OPT(fill_pow_hash, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1763,7 +1763,7 @@ namespace cryptonote
KV_SERIALIZE_PARENT(rpc_access_request_base)
KV_SERIALIZE(start_height)
KV_SERIALIZE(end_height)
- KV_SERIALIZE_OPT(fill_pow_hash, false);
+ KV_SERIALIZE_OPT(fill_pow_hash, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -2124,12 +2124,12 @@ namespace cryptonote
uint64_t recent_cutoff;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_PARENT(rpc_access_request_base);
- KV_SERIALIZE(amounts);
- KV_SERIALIZE(min_count);
- KV_SERIALIZE(max_count);
- KV_SERIALIZE(unlocked);
- KV_SERIALIZE(recent_cutoff);
+ KV_SERIALIZE_PARENT(rpc_access_request_base)
+ KV_SERIALIZE(amounts)
+ KV_SERIALIZE(min_count)
+ KV_SERIALIZE(max_count)
+ KV_SERIALIZE(unlocked)
+ KV_SERIALIZE(recent_cutoff)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -2142,10 +2142,10 @@ namespace cryptonote
uint64_t recent_instances;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(amount);
- KV_SERIALIZE(total_instances);
- KV_SERIALIZE(unlocked_instances);
- KV_SERIALIZE(recent_instances);
+ KV_SERIALIZE(amount)
+ KV_SERIALIZE(total_instances)
+ KV_SERIALIZE(unlocked_instances)
+ KV_SERIALIZE(recent_instances)
END_KV_SERIALIZE_MAP()
entry(uint64_t amount, uint64_t total_instances, uint64_t unlocked_instances, uint64_t recent_instances):
@@ -2216,9 +2216,9 @@ namespace cryptonote
uint64_t count;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_PARENT(rpc_access_request_base);
- KV_SERIALIZE(height);
- KV_SERIALIZE(count);
+ KV_SERIALIZE_PARENT(rpc_access_request_base)
+ KV_SERIALIZE(height)
+ KV_SERIALIZE(count)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
diff --git a/src/wallet/message_transporter.cpp b/src/wallet/message_transporter.cpp
index 7aa765c87..b4f6ce7bd 100644
--- a/src/wallet/message_transporter.cpp
+++ b/src/wallet/message_transporter.cpp
@@ -61,7 +61,7 @@ namespace bitmessage_rpc
KV_SERIALIZE(toAddress)
KV_SERIALIZE(read)
KV_SERIALIZE(msgid)
- KV_SERIALIZE(message);
+ KV_SERIALIZE(message)
KV_SERIALIZE(fromAddress)
KV_SERIALIZE(receivedTime)
KV_SERIALIZE(subject)
diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index c00271030..33afefb80 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -68,8 +68,8 @@ namespace wallet_rpc
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(account_index)
KV_SERIALIZE(address_indices)
- KV_SERIALIZE_OPT(all_accounts, false);
- KV_SERIALIZE_OPT(strict, false);
+ KV_SERIALIZE_OPT(all_accounts, false)
+ KV_SERIALIZE_OPT(strict, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -348,9 +348,9 @@ namespace wallet_rpc
std::vector<uint32_t> accounts;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(tag);
- KV_SERIALIZE(label);
- KV_SERIALIZE(accounts);
+ KV_SERIALIZE(tag)
+ KV_SERIALIZE(label)
+ KV_SERIALIZE(accounts)
END_KV_SERIALIZE_MAP()
};
@@ -1029,7 +1029,7 @@ namespace wallet_rpc
KV_SERIALIZE(tx_hash)
KV_SERIALIZE(subaddr_index)
KV_SERIALIZE(key_image)
- KV_SERIALIZE(pubkey);
+ KV_SERIALIZE(pubkey)
KV_SERIALIZE(block_height)
KV_SERIALIZE(frozen)
KV_SERIALIZE(unlocked)
@@ -1165,7 +1165,7 @@ namespace wallet_rpc
bool hard;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_OPT(hard, false);
+ KV_SERIALIZE_OPT(hard, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1408,21 +1408,21 @@ namespace wallet_rpc
uint64_t suggested_confirmations_threshold;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(txid);
- KV_SERIALIZE(payment_id);
- KV_SERIALIZE(height);
- KV_SERIALIZE(timestamp);
- KV_SERIALIZE(amount);
- KV_SERIALIZE(amounts);
- KV_SERIALIZE(fee);
- KV_SERIALIZE(note);
- KV_SERIALIZE(destinations);
- KV_SERIALIZE(type);
+ KV_SERIALIZE(txid)
+ KV_SERIALIZE(payment_id)
+ KV_SERIALIZE(height)
+ KV_SERIALIZE(timestamp)
+ KV_SERIALIZE(amount)
+ KV_SERIALIZE(amounts)
+ KV_SERIALIZE(fee)
+ KV_SERIALIZE(note)
+ KV_SERIALIZE(destinations)
+ KV_SERIALIZE(type)
KV_SERIALIZE(unlock_time)
KV_SERIALIZE(locked)
- KV_SERIALIZE(subaddr_index);
- KV_SERIALIZE(subaddr_indices);
- KV_SERIALIZE(address);
+ KV_SERIALIZE(subaddr_index)
+ KV_SERIALIZE(subaddr_indices)
+ KV_SERIALIZE(address)
KV_SERIALIZE(double_spend_seen)
KV_SERIALIZE_OPT(confirmations, (uint64_t)0)
KV_SERIALIZE_OPT(suggested_confirmations_threshold, (uint64_t)0)
@@ -1559,17 +1559,17 @@ namespace wallet_rpc
bool all_accounts;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(in);
- KV_SERIALIZE(out);
- KV_SERIALIZE(pending);
- KV_SERIALIZE(failed);
- KV_SERIALIZE(pool);
- KV_SERIALIZE(filter_by_height);
- KV_SERIALIZE(min_height);
- KV_SERIALIZE_OPT(max_height, (uint64_t)CRYPTONOTE_MAX_BLOCK_NUMBER);
- KV_SERIALIZE(account_index);
- KV_SERIALIZE(subaddr_indices);
- KV_SERIALIZE_OPT(all_accounts, false);
+ KV_SERIALIZE(in)
+ KV_SERIALIZE(out)
+ KV_SERIALIZE(pending)
+ KV_SERIALIZE(failed)
+ KV_SERIALIZE(pool)
+ KV_SERIALIZE(filter_by_height)
+ KV_SERIALIZE(min_height)
+ KV_SERIALIZE_OPT(max_height, (uint64_t)CRYPTONOTE_MAX_BLOCK_NUMBER)
+ KV_SERIALIZE(account_index)
+ KV_SERIALIZE(subaddr_indices)
+ KV_SERIALIZE_OPT(all_accounts, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1583,11 +1583,11 @@ namespace wallet_rpc
std::list<transfer_entry> pool;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(in);
- KV_SERIALIZE(out);
- KV_SERIALIZE(pending);
- KV_SERIALIZE(failed);
- KV_SERIALIZE(pool);
+ KV_SERIALIZE(in)
+ KV_SERIALIZE(out)
+ KV_SERIALIZE(pending)
+ KV_SERIALIZE(failed)
+ KV_SERIALIZE(pool)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1601,7 +1601,7 @@ namespace wallet_rpc
uint32_t account_index;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(txid);
+ KV_SERIALIZE(txid)
KV_SERIALIZE_OPT(account_index, (uint32_t)0)
END_KV_SERIALIZE_MAP()
};
@@ -1613,8 +1613,8 @@ namespace wallet_rpc
std::list<transfer_entry> transfers;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(transfer);
- KV_SERIALIZE(transfers);
+ KV_SERIALIZE(transfer)
+ KV_SERIALIZE(transfers)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1643,7 +1643,7 @@ namespace wallet_rpc
std::string signature;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(signature);
+ KV_SERIALIZE(signature)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1658,9 +1658,9 @@ namespace wallet_rpc
std::string signature;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(data);
- KV_SERIALIZE(address);
- KV_SERIALIZE(signature);
+ KV_SERIALIZE(data)
+ KV_SERIALIZE(address)
+ KV_SERIALIZE(signature)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1673,10 +1673,10 @@ namespace wallet_rpc
std::string signature_type;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(good);
- KV_SERIALIZE(version);
- KV_SERIALIZE(old);
- KV_SERIALIZE(signature_type);
+ KV_SERIALIZE(good)
+ KV_SERIALIZE(version)
+ KV_SERIALIZE(old)
+ KV_SERIALIZE(signature_type)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1703,7 +1703,7 @@ namespace wallet_rpc
std::string outputs_data_hex;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(outputs_data_hex);
+ KV_SERIALIZE(outputs_data_hex)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1716,7 +1716,7 @@ namespace wallet_rpc
std::string outputs_data_hex;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(outputs_data_hex);
+ KV_SERIALIZE(outputs_data_hex)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1726,7 +1726,7 @@ namespace wallet_rpc
uint64_t num_imported;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(num_imported);
+ KV_SERIALIZE(num_imported)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1739,7 +1739,7 @@ namespace wallet_rpc
bool all;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_OPT(all, false);
+ KV_SERIALIZE_OPT(all, false)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1750,8 +1750,8 @@ namespace wallet_rpc
std::string signature;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(key_image);
- KV_SERIALIZE(signature);
+ KV_SERIALIZE(key_image)
+ KV_SERIALIZE(signature)
END_KV_SERIALIZE_MAP()
};
@@ -1761,8 +1761,8 @@ namespace wallet_rpc
std::vector<signed_key_image> signed_key_images;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(offset);
- KV_SERIALIZE(signed_key_images);
+ KV_SERIALIZE(offset)
+ KV_SERIALIZE(signed_key_images)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1776,8 +1776,8 @@ namespace wallet_rpc
std::string signature;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(key_image);
- KV_SERIALIZE(signature);
+ KV_SERIALIZE(key_image)
+ KV_SERIALIZE(signature)
END_KV_SERIALIZE_MAP()
};
@@ -1787,8 +1787,8 @@ namespace wallet_rpc
std::vector<signed_key_image> signed_key_images;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE_OPT(offset, (uint32_t)0);
- KV_SERIALIZE(signed_key_images);
+ KV_SERIALIZE_OPT(offset, (uint32_t)0)
+ KV_SERIALIZE(signed_key_images)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -1817,11 +1817,11 @@ namespace wallet_rpc
std::string recipient_name;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(address);
- KV_SERIALIZE(payment_id);
- KV_SERIALIZE(amount);
- KV_SERIALIZE(tx_description);
- KV_SERIALIZE(recipient_name);
+ KV_SERIALIZE(address)
+ KV_SERIALIZE(payment_id)
+ KV_SERIALIZE(amount)
+ KV_SERIALIZE(tx_description)
+ KV_SERIALIZE(recipient_name)
END_KV_SERIALIZE_MAP()
};
@@ -1861,8 +1861,8 @@ namespace wallet_rpc
std::vector<std::string> unknown_parameters;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(uri);
- KV_SERIALIZE(unknown_parameters);
+ KV_SERIALIZE(uri)
+ KV_SERIALIZE(unknown_parameters)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1887,7 +1887,7 @@ namespace wallet_rpc
uint64_t index;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(index);
+ KV_SERIALIZE(index)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -1964,7 +1964,7 @@ namespace wallet_rpc
uint64_t index;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(index);
+ KV_SERIALIZE(index)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<request_t> request;
@@ -2012,8 +2012,8 @@ namespace wallet_rpc
bool received_money;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(blocks_fetched);
- KV_SERIALIZE(received_money);
+ KV_SERIALIZE(blocks_fetched)
+ KV_SERIALIZE(received_money)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
diff --git a/tests/unit_tests/net.cpp b/tests/unit_tests/net.cpp
index b9555b213..2b565f7d0 100644
--- a/tests/unit_tests/net.cpp
+++ b/tests/unit_tests/net.cpp
@@ -239,7 +239,7 @@ namespace
net::tor_address tor;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(tor);
+ KV_SERIALIZE(tor)
END_KV_SERIALIZE_MAP()
};
}
@@ -611,7 +611,7 @@ namespace
net::i2p_address i2p;
BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(i2p);
+ KV_SERIALIZE(i2p)
END_KV_SERIALIZE_MAP()
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 06:47:39 +0000