diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index ce5a35f2b8..8da8844529 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -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(s, newcoin::mtSTATUS_CHANGE); diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index 08bfa4e1ad..e1949e06cf 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -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(s, newcoin::mtSTATUS_CHANGE); diff --git a/src/Peer.cpp b/src/Peer.cpp index 8d9a823c95..ca70226ade 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -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(h, newcoin::mtHELLO); diff --git a/src/newcoin.proto b/src/newcoin.proto index ea5bbd91fc..d902073f4f 100644 --- a/src/newcoin.proto +++ b/src/newcoin.proto @@ -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; }