Rename setInventoryKnown filterInventoryKnown

pstratem · Fuzzbawls · commit 01273db09b52 · 2020-06-22T17:38:09.000-07:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -6397,7 +6397,7 @@ bool SendMessages(CNode* pto)
             vInv.reserve(pto->vInventoryToSend.size());
             vInvWait.reserve(pto->vInventoryToSend.size());
             for (const CInv& inv : pto->vInventoryToSend) {
-                if (pto->setInventoryKnown.contains(inv.hash))
+                if (pto->filterInventoryKnown.contains(inv.hash))
                     continue;
 
                 // trickle out tx inv to protect privacy
@@ -6416,8 +6416,8 @@ bool SendMessages(CNode* pto)
                     }
                 }
 
-                if (!pto->setInventoryKnown.contains(inv.hash)) {
-                    pto->setInventoryKnown.insert(inv.hash);
+                if (!pto->filterInventoryKnown.contains(inv.hash)) {
+                    pto->filterInventoryKnown.insert(inv.hash);
                     vInv.push_back(inv);
                     if (vInv.size() >= 1000) {
                         pto->PushMessage(NetMsgType::INV, vInv);
diff --git a/src/net.cpp b/src/net.cpp
@@ -2319,7 +2319,7 @@ unsigned int SendBufferSize() { return 1000 * GetArg("-maxsendbuffer", 1 * 1000)
 CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addrKnown(5000, 0.001),
-    setInventoryKnown(50000, 0.000001)
+    filterInventoryKnown(50000, 0.000001)
 {
     nServices = NODE_NONE;
     nServicesExpected = NODE_NONE;
@@ -2347,7 +2347,7 @@ CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fIn
     nSendOffset = 0;
     hashContinue = UINT256_ZERO;
     nStartingHeight = -1;
-    setInventoryKnown.reset();
+    filterInventoryKnown.reset();
     fGetAddr = false;
     nNextLocalAddrSend = 0;
     nNextAddrSend = 0;
diff --git a/src/net.h b/src/net.h
@@ -386,7 +386,7 @@ class CNode
     int64_t nNextLocalAddrSend;
 
     // inventory based relay
-    CRollingBloomFilter setInventoryKnown;
+    CRollingBloomFilter filterInventoryKnown;
     std::vector<CInv> vInventoryToSend;
     RecursiveMutex cs_inventory;
     std::multimap<int64_t, CInv> mapAskFor;
@@ -486,15 +486,15 @@ class CNode
     {
         {
             LOCK(cs_inventory);
-            setInventoryKnown.insert(inv.hash);
+            filterInventoryKnown.insert(inv.hash);
         }
     }
 
     void PushInventory(const CInv& inv)
     {
         {
             LOCK(cs_inventory);
-            if (!setInventoryKnown.contains(inv.hash))
+            if (!filterInventoryKnown.contains(inv.hash))
                 vInventoryToSend.push_back(inv);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ class CNode`
`386`	`386`	`int64_t nNextLocalAddrSend;`
`387`	`387`
`388`	`388`	`// inventory based relay`
`389`		`- CRollingBloomFilter setInventoryKnown;`
	`389`	`+ CRollingBloomFilter filterInventoryKnown;`
`390`	`390`	`std::vector<CInv> vInventoryToSend;`
`391`	`391`	`RecursiveMutex cs_inventory;`
`392`	`392`	`std::multimap<int64_t, CInv> mapAskFor;`
`@@ -486,15 +486,15 @@ class CNode`
`486`	`486`	`{`
`487`	`487`	`{`
`488`	`488`	`LOCK(cs_inventory);`
`489`		`- setInventoryKnown.insert(inv.hash);`
	`489`	`+ filterInventoryKnown.insert(inv.hash);`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`void PushInventory(const CInv& inv)`
`494`	`494`	`{`
`495`	`495`	`{`
`496`	`496`	`LOCK(cs_inventory);`
`497`		`- if (!setInventoryKnown.contains(inv.hash))`
	`497`	`+ if (!filterInventoryKnown.contains(inv.hash))`
`498`	`498`	`vInventoryToSend.push_back(inv);`
`499`	`499`	`}`
`500`	`500`	`}`