From 9326074324ba92ce047fcdcc80c72df4047e7013 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 22 Oct 2012 12:26:51 -0700 Subject: [PATCH] Second phase of removing old-style ledger data queries -- always give new style replies. --- src/Peer.cpp | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/Peer.cpp b/src/Peer.cpp index e44608049..f115db278 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -1053,25 +1053,22 @@ void Peer::recvGetLedger(ripple::TMGetLedger& packet) ledger->addRaw(nData); reply.add_nodes()->set_nodedata(nData.getDataPtr(), nData.getLength()); - if (packet.nodeids().size() != 0) - { // new-style root request - cLog(lsINFO) << "Ledger root w/map roots request"; - SHAMap::pointer map = ledger->peekAccountStateMap(); - if (map && map->getHash().isNonZero()) - { // return account state root node if possible - Serializer rootNode(768); - if (map->getRootNode(rootNode, snfWIRE)) + cLog(lsINFO) << "Ledger root w/map roots request"; + SHAMap::pointer map = ledger->peekAccountStateMap(); + if (map && map->getHash().isNonZero()) + { // return account state root node if possible + Serializer rootNode(768); + if (map->getRootNode(rootNode, snfWIRE)) + { + reply.add_nodes()->set_nodedata(rootNode.getDataPtr(), rootNode.getLength()); + if (ledger->getTransHash().isNonZero()) { - reply.add_nodes()->set_nodedata(rootNode.getDataPtr(), rootNode.getLength()); - if (ledger->getTransHash().isNonZero()) + map = ledger->peekTransactionMap(); + if (map && map->getHash().isNonZero()) { - map = ledger->peekTransactionMap(); - if (map && map->getHash().isNonZero()) - { - rootNode.resize(0); - if (map->getRootNode(rootNode, snfWIRE)) - reply.add_nodes()->set_nodedata(rootNode.getDataPtr(), rootNode.getLength()); - } + rootNode.resize(0); + if (map->getRootNode(rootNode, snfWIRE)) + reply.add_nodes()->set_nodedata(rootNode.getDataPtr(), rootNode.getLength()); } } }