ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic, rename a few protobuf fields.

Browse Source
This commit is contained in:
Arthur Britto
2012-06-28 01:01:44 -07:00
parent 9f2c4b163f
commit 029bcfa6d9
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LedgerConsensus.cpp
View File

@@ -334,7 +334,7 @@ void LedgerConsensus::statusChange(newcoin::NodeEvent event, Ledger::pointer led
s.set_ledgerseq(ledger->getLedgerSeq());
s.set_networktime(theApp->getOPs().getNetworkTimeNC());
uint256 hash = ledger->getParentHash();
s.set_previousledgerhash(hash.begin(), hash.size());
s.set_ledgerhashprevious(hash.begin(), hash.size());
hash = ledger->getHash();
s.set_ledgerhash(hash.begin(), hash.size());
PackedMessage::pointer packet = boost::make_shared<PackedMessage>(s, newcoin::mtSTATUS_CHANGE);

2
src/NetworkOPs.cpp
View File

@@ -481,7 +481,7 @@ void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger)
s.set_ledgerseq(newLedger->getLedgerSeq());
s.set_networktime(theApp->getOPs().getNetworkTimeNC());
uint256 hash = newLedger->getParentHash();
s.set_previousledgerhash(hash.begin(), hash.size());
s.set_ledgerhashprevious(hash.begin(), hash.size());
hash = newLedger->getHash();
s.set_ledgerhash(hash.begin(), hash.size());
PackedMessage::pointer packet = boost::make_shared<PackedMessage>(s, newcoin::mtSTATUS_CHANGE);

16
src/Peer.cpp
View File

@@ -625,11 +625,11 @@ void Peer::recvHello(newcoin::TMHello& packet)
// XXX Set timer: connection is in grace period to be useful.
// XXX Set timer: connection idle (idle may vary depending on connection type.)
if ((packet.has_closedledger()) && (packet.closedledger().size() == (256 / 8)))
if ((packet.has_ledgerclosed()) && (packet.ledgerclosed().size() == (256 / 8)))
{
memcpy(mClosedLedgerHash.begin(), packet.closedledger().data(), 256 / 8);
if ((packet.has_previousledger()) && (packet.previousledger().size() == (256 / 8)))
memcpy(mPreviousLedgerHash.begin(), packet.previousledger().data(), 256 / 8);
memcpy(mClosedLedgerHash.begin(), packet.ledgerclosed().data(), 256 / 8);
if ((packet.has_ledgerprevious()) && (packet.ledgerprevious().size() == (256 / 8)))
memcpy(mPreviousLedgerHash.begin(), packet.ledgerprevious().data(), 256 / 8);
else mPreviousLedgerHash.zero();
mClosedLedgerTime = boost::posix_time::second_clock::universal_time();
}
@@ -891,9 +891,9 @@ void Peer::recvStatus(newcoin::TMStatusChange& packet)
mClosedLedgerHash.zero();
}
if (packet.has_previousledgerhash() && packet.previousledgerhash().size() == (256 / 8))
if (packet.has_ledgerhashprevious() && packet.ledgerhashprevious().size() == (256 / 8))
{
memcpy(mPreviousLedgerHash.begin(), packet.previousledgerhash().data(), 256 / 8);
memcpy(mPreviousLedgerHash.begin(), packet.ledgerhashprevious().data(), 256 / 8);
}
else mPreviousLedgerHash.zero();
}
@@ -1124,9 +1124,9 @@ void Peer::sendHello()
if (closedLedger && closedLedger->isClosed())
{
uint256 hash = closedLedger->getHash();
h.set_closedledger(hash.begin(), hash.GetSerializeSize());
h.set_ledgerclosed(hash.begin(), hash.GetSerializeSize());
hash = closedLedger->getParentHash();
h.set_previousledger(hash.begin(), hash.GetSerializeSize());
h.set_ledgerprevious(hash.begin(), hash.GetSerializeSize());
}
PackedMessage::pointer packet = boost::make_shared<PackedMessage>(h, newcoin::mtHELLO);

6
src/newcoin.proto
View File

@@ -45,8 +45,8 @@ message TMHello {
optional uint64 netTime = 6;
optional uint32 ipv4Port = 7;
optional uint32 ledgerIndex = 8;
optional bytes closedLedger = 9; // our last closed ledger
optional bytes previousLedger = 10; // the ledger before the last closed ledger
optional bytes ledgerClosed = 9; // our last closed ledger
optional bytes ledgerPrevious = 10; // the ledger before the last closed ledger
}
@@ -95,7 +95,7 @@ message TMStatusChange {
optional NodeEvent newEvent = 2;
optional uint32 ledgerSeq = 3;
optional bytes ledgerHash = 4;
optional bytes previousLedgerHash = 5;
optional bytes ledgerHashPrevious = 5;
optional uint64 networkTime = 6;
}