Merge #10351: removed unused code in INV message

sipa · sipa · commit 3f57c55dba6e · 2017-05-07T22:01:51.000-07:00
c707ca8 removed unused code in INV message (Greg Griffith) Tree-SHA512: 8152e9bfb7e1e8a321e7c05ea46826b3ecea6fa5e176727a9c944db170cb134ba1adfa0251bece9683a68d52266291bca58240929337aba6328b915931e60eb9
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1552,8 +1552,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         uint32_t nFetchFlags = GetFetchFlags(pfrom);
 
-        std::vector<CInv> vToFetch;
-
         for (unsigned int nInv = 0; nInv < vInv.size(); nInv++)
         {
             CInv &inv = vInv[nInv];
@@ -1593,9 +1591,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             // Track requests for our stuff
             GetMainSignals().Inventory(inv.hash);
         }
-
-        if (!vToFetch.empty())
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1552,8 +1552,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr`
`1552`	`1552`
`1553`	`1553`	`uint32_t nFetchFlags = GetFetchFlags(pfrom);`
`1554`	`1554`
`1555`		`- std::vector<CInv> vToFetch;`
`1556`		`-`
`1557`	`1555`	`for (unsigned int nInv = 0; nInv < vInv.size(); nInv++)`
`1558`	`1556`	`{`
`1559`	`1557`	`CInv &inv = vInv[nInv];`
`@@ -1593,9 +1591,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr`
`1593`	`1591`	`// Track requests for our stuff`
`1594`	`1592`	`GetMainSignals().Inventory(inv.hash);`
`1595`	`1593`	`}`
`1596`		`-`
`1597`		`- if (!vToFetch.empty())`
`1598`		`- connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vToFetch));`
`1599`	`1594`	`}`
`1600`	`1595`
`1601`	`1596`