ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
JoelKatz
2012-02-05 07:15:41 -08:00
parent ef0c9d036a
commit 3ec994f435
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Peer.cpp
View File

@@ -4,6 +4,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
//#include <boost/log/trivial.hpp> //#include <boost/log/trivial.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include "json/writer.h" #include "json/writer.h"
@@ -341,7 +342,7 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet)
std::string rawTx=packet.rawtransaction(); std::string rawTx=packet.rawtransaction();
std::vector<unsigned char> rTx(rawTx.size()); std::vector<unsigned char> rTx(rawTx.size());
memcpy(&rTx.front(), rawTx.data(), rawTx.size()); memcpy(&rTx.front(), rawTx.data(), rawTx.size());
Transaction::pointer tx(new Transaction(rTx, true)); Transaction::pointer tx=boost::make_shared<Transaction>(rTx, true);
if(tx->getStatus()==INVALID) if(tx->getStatus()==INVALID)
{ // transaction fails basic validity tests { // transaction fails basic validity tests
@@ -436,7 +437,8 @@ void Peer::sendHello()
h->set_closedledger(s.getDataPtr(), s.getLength()); h->set_closedledger(s.getDataPtr(), s.getLength());
} }
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(h), newcoin::mtHELLO)); PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(h), newcoin::mtHELLO);
sendPacket(packet); sendPacket(packet);
} }
@@ -464,7 +466,8 @@ PackedMessage::pointer Peer::createLedgerProposal(Ledger::pointer ledger)
prop->set_hash(hash.begin(),hash.GetSerializeSize()); prop->set_hash(hash.begin(),hash.GetSerializeSize());
prop->set_numtransactions(ledger->getNumTransactions()); prop->set_numtransactions(ledger->getNumTransactions());
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(prop),newcoin::PROPOSE_LEDGER)); PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(prop),newcoin::PROPOSE_LEDGER);
return(packet); return(packet);
} }
@@ -481,7 +484,8 @@ PackedMessage::pointer Peer::createValidation(Ledger::pointer ledger)
valid->set_hanko(theConfig.HANKO); valid->set_hanko(theConfig.HANKO);
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(valid),newcoin::VALIDATION)); PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(valid),newcoin::VALIDATION);
return(packet); return(packet);
} }
@@ -490,7 +494,8 @@ PackedMessage::pointer Peer::createGetFullLedger(uint256& hash)
newcoin::GetFullLedger* gfl=new newcoin::GetFullLedger(); newcoin::GetFullLedger* gfl=new newcoin::GetFullLedger();
gfl->set_hash(hash.begin(),hash.GetSerializeSize()); gfl->set_hash(hash.begin(),hash.GetSerializeSize());
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(gfl),newcoin::GET_FULL_LEDGER)); PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(gfl),newcoin::GET_FULL_LEDGER);
return(packet); return(packet);
} }
@@ -539,7 +544,8 @@ void Peer::receiveGetValidations(newcoin::GetValidations& request)
{ {
BOOST_FOREACH(newcoin::Validation& valid, validations) BOOST_FOREACH(newcoin::Validation& valid, validations)
{ {
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(new newcoin::Validation(valid)),newcoin::VALIDATION)); PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(new newcoin::Validation(valid)),newcoin::VALIDATION));
sendPacket(packet); sendPacket(packet);
} }
} }
@@ -552,7 +558,8 @@ void Peer::receiveTransaction(TransactionPtr trans)
{ {
// broadcast it to other Peers // broadcast it to other Peers
ConnectionPool& pool=theApp->getConnectionPool(); ConnectionPool& pool=theApp->getConnectionPool();
PackedMessage::pointer packet(new PackedMessage(PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))),newcoin::TRANSACTION)); PackedMessage::pointer packet=boost::make_shread<PackedMessage>
(PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))),newcoin::TRANSACTION);
pool.relayMessage(this,packet); pool.relayMessage(this,packet);
}else }else
{ {