aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api/pending_transaction.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-11-09 14:10:12 +0200
committerRiccardo Spagni <ric@spagni.net>2016-11-09 14:10:12 +0200
commit06ca304b062e739eb7c6177bb5eccaadd5bcd4c1 (patch)
treea1445616b29cf5fd787fd3dbdc300417363903e1 /src/wallet/api/pending_transaction.cpp
parentMerge pull request #1305 (diff)
parentwallet_api: PendingTransaction::txCount - number of split transactions (diff)
downloadmonero-06ca304b062e739eb7c6177bb5eccaadd5bcd4c1.tar.xz
Merge pull request #1307
4dcb74f wallet_api: PendingTransaction::txCount - number of split transactions (Ilya Kitaev)
Diffstat (limited to 'src/wallet/api/pending_transaction.cpp')
-rw-r--r--src/wallet/api/pending_transaction.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp
index 80fb0b9a4..2521decea 100644
--- a/src/wallet/api/pending_transaction.cpp
+++ b/src/wallet/api/pending_transaction.cpp
@@ -80,8 +80,8 @@ std::vector<std::string> PendingTransactionImpl::txid() const
bool PendingTransactionImpl::commit()
{
- LOG_PRINT_L0("m_pending_tx size: " << m_pending_tx.size());
- assert(m_pending_tx.size() == 1);
+ LOG_PRINT_L3("m_pending_tx size: " << m_pending_tx.size());
+
try {
while (!m_pending_tx.empty()) {
auto & ptx = m_pending_tx.back();
@@ -142,5 +142,10 @@ uint64_t PendingTransactionImpl::fee() const
return result;
}
+uint64_t PendingTransactionImpl::txCount() const
+{
+ return m_pending_tx.size();
+}
+
}