AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-03 04:19:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

WalletServer update

Browse Source
This commit is contained in:
Andre Jochems
2016-03-28 18:07:52 +02:00
parent 336757fb55
commit 5f961bbcaf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/walletserversession.cpp
View File

@@ -51,7 +51,7 @@ void WalletServerSession::NotifyTransactionChanged(CWallet *wallet, const uint25
list<pair<CTxDestination, int64> > listReceived; list<pair<CTxDestination, int64> > listReceived;
list<pair<CTxDestination, int64> > listSent; list<pair<CTxDestination, int64> > listSent;
tx.GetAmounts(listReceived, listSent, nFee, strSentAccount); tx.GetAmounts(listReceived, listSent, nFee, strSentAccount);
printf("WalletServerSession - NotifyTransactionChanged: received: %i sent: %i", listReceived.size(), listSent.size()); printf("WalletServerSession - NotifyTransactionChanged: received: %lu sent: %lu\n", listReceived.size(), listSent.size());
if(nFee < CTransaction::nMinTxFee) if(nFee < CTransaction::nMinTxFee)
nFee = CTransaction::nMinTxFee; nFee = CTransaction::nMinTxFee;
// define output object // define output object
@@ -64,9 +64,9 @@ void WalletServerSession::NotifyTransactionChanged(CWallet *wallet, const uint25
result.push_back(json_spirit::Pair("errorCode", 0)); result.push_back(json_spirit::Pair("errorCode", 0));
result.push_back(json_spirit::Pair("errorMessage", "")); result.push_back(json_spirit::Pair("errorMessage", ""));
result.push_back(json_spirit::Pair("transactionid", hash.ToString())); result.push_back(json_spirit::Pair("transactionid", hash.ToString()));
result.push_back(json_spirit::Pair("transactiontime", tx.GetTxTime())); result.push_back(json_spirit::Pair("transactiontime", boost::int64_t(tx.GetTxTime())));
// Send // Send
if (!listSent.empty() || nFee != 0) if (listSent.size() > 0 || nFee != 0)
{ {
BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& s, listSent) BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& s, listSent)
{ {
@@ -77,7 +77,7 @@ void WalletServerSession::NotifyTransactionChanged(CWallet *wallet, const uint25
} }
} }
// Received // Received
else if (listReceived.size() > 0 && tx.GetDepthInMainChain() >= 1) else if (listReceived.size() > 0)
{ {
BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& r, listReceived) BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& r, listReceived)
{ {
@@ -101,7 +101,7 @@ void WalletServerSession::sendMessageToQueue(json_spirit::Object outputJson)
// add an outgoing message to the topic // add an outgoing message to the topic
std::string body = json_spirit::write(outputJson); std::string body = json_spirit::write(outputJson);
printf("WalletServerSession %s JSON: %s\n", sessionId.c_str(), body.c_str()); printf("WalletServerSession %s JSON: %s\n", sessionId.c_str(), body.c_str());
bool sendResult = session_stomp_client->send(WalletServer::server_out_queue, headers, body); session_stomp_client->send(WalletServer::server_out_queue, headers, body);
} }
catch (std::exception& e) catch (std::exception& e)
{ {