Cosmetic changes.

This commit is contained in:
Arthur Britto
2012-04-24 14:47:58 -07:00
parent 65126360c9
commit f24a43bb7a
6 changed files with 16 additions and 16 deletions

View File

@@ -115,9 +115,9 @@ Json::Value ConnectionPool::getPeersJson()
BOOST_FOREACH(Peer::pointer peer, mPeers) BOOST_FOREACH(Peer::pointer peer, mPeers)
{ {
ret.append(peer->getJson()); ret.append(peer->getJson());
} }
return ret; return ret;
} }
// vim:ts=4

View File

@@ -39,3 +39,4 @@ public:
}; };
#endif #endif
// vim:ts=4

View File

@@ -41,7 +41,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra
if(!mSendQ.empty()) if(!mSendQ.empty())
{ {
PackedMessage::pointer packet=mSendQ.front(); PackedMessage::pointer packet=mSendQ.front();
if(packet) if(packet)
{ {
sendPacketForce(packet); sendPacketForce(packet);
mSendQ.pop_front(); mSendQ.pop_front();
@@ -70,7 +70,6 @@ void Peer::connected(const boost::system::error_code& error)
detach(); detach();
std::cout << "Peer::connected Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; std::cout << "Peer::connected Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error;
} }
} }
void Peer::sendPacketForce(PackedMessage::pointer packet) void Peer::sendPacketForce(PackedMessage::pointer packet)
@@ -141,7 +140,7 @@ void Peer::handle_read_header(const boost::system::error_code& error)
void Peer::handle_read_body(const boost::system::error_code& error) void Peer::handle_read_body(const boost::system::error_code& error)
{ {
if(!error) if(!error)
{ {
processReadBuffer(); processReadBuffer();
start_read_header(); start_read_header();
@@ -358,7 +357,7 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet)
#endif #endif
return; return;
} }
tx=theApp->getOPs().processTransaction(tx, this); tx=theApp->getOPs().processTransaction(tx, this);
if(tx->getStatus()!=INCLUDED) if(tx->getStatus()!=INCLUDED)
@@ -543,7 +542,7 @@ void Peer::sendHello()
PackedMessage::pointer packet=boost::make_shared<PackedMessage> PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(h), newcoin::mtHELLO); (PackedMessage::MessagePointer(h), newcoin::mtHELLO);
sendPacket(packet); sendPacket(packet);
} }
void Peer::punishPeer(PeerPunish) void Peer::punishPeer(PeerPunish)
@@ -571,7 +570,7 @@ PackedMessage::pointer Peer::createFullLedger(Ledger::pointer ledger)
newcoin::FullLedger* fullLedger=new newcoin::FullLedger(); newcoin::FullLedger* fullLedger=new newcoin::FullLedger();
ledger-> ledger->
} }
return(PackedMessage::pointer()); return(PackedMessage::pointer());
}*/ }*/
@@ -599,7 +598,6 @@ PackedMessage::pointer Peer::createValidation(Ledger::pointer ledger)
valid->set_seqnum(ledger->getValidSeqNum()); valid->set_seqnum(ledger->getValidSeqNum());
valid->set_sig(sig.begin(), sig.GetSerializeSize()); valid->set_sig(sig.begin(), sig.GetSerializeSize());
valid->set_hanko(theConfig.HANKO); valid->set_hanko(theConfig.HANKO);
PackedMessage::pointer packet=boost::make_shared<PackedMessage> PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(valid), newcoin::VALIDATION); (PackedMessage::MessagePointer(valid), newcoin::VALIDATION);
@@ -623,12 +621,12 @@ void Peer::sendLedgerProposal(Ledger::pointer ledger)
} }
void Peer::sendFullLedger(Ledger::pointer ledger) void Peer::sendFullLedger(Ledger::pointer ledger)
{ {
if(ledger) if(ledger)
{ {
PackedMessage::pointer packet( PackedMessage::pointer packet(
new PackedMessage(PackedMessage::MessagePointer(ledger->createFullLedger()), newcoin::FULL_LEDGER)); new PackedMessage(PackedMessage::MessagePointer(ledger->createFullLedger()), newcoin::FULL_LEDGER));
sendPacket(packet); sendPacket(packet);
} }
} }
@@ -679,7 +677,7 @@ void Peer::receiveTransaction(TransactionPtr trans)
(PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))), newcoin::TRANSACTION); (PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))), newcoin::TRANSACTION);
pool.relayMessage(this, packet); pool.relayMessage(this, packet);
} }
else else
{ {
std::cout << "Invalid transaction: " << trans->from() << std::endl; std::cout << "Invalid transaction: " << trans->from() << std::endl;
} }
@@ -687,7 +685,6 @@ void Peer::receiveTransaction(TransactionPtr trans)
void Peer::receiveProposeLedger(newcoin::ProposeLedger& packet) void Peer::receiveProposeLedger(newcoin::ProposeLedger& packet)
{ {
theApp->getLedgerMaster().checkLedgerProposal(shared_from_this(), packet); theApp->getLedgerMaster().checkLedgerProposal(shared_from_this(), packet);
} }
@@ -699,9 +696,9 @@ void Peer::receiveFullLedger(newcoin::FullLedger& packet)
void Peer::connectTo(KnownNode& node) void Peer::connectTo(KnownNode& node)
{ {
tcp::endpoint endpoint( address::from_string(node.mIP), node.mPort); tcp::endpoint endpoint( address::from_string(node.mIP), node.mPort);
mSocket.async_connect(endpoint, mSocket.async_connect(endpoint,
boost::bind(&Peer::connected, this, boost::asio::placeholders::error) ); boost::bind(&Peer::connected, this, boost::asio::placeholders::error) );
} }
#endif #endif
// vim:ts=4

View File

@@ -102,3 +102,4 @@ public:
}; };
#endif #endif
// vim:ts=4

View File

@@ -33,4 +33,4 @@ void PeerDoor::handleConnect(Peer::pointer new_connection,
startListening(); startListening();
} }
// vim:ts=4

View File

@@ -19,3 +19,4 @@ class PeerDoor
public: public:
PeerDoor(boost::asio::io_service& io_service); PeerDoor(boost::asio::io_service& io_service);
}; };
// vim:ts=4