Update -enforcenodebloom RPC test with filterclear vs filteradd

qa/rpc-tests/p2p_node_bloom.py

@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.mininode import NodeConn, NodeConnCB, NetworkThread, \
-    msg_filterclear, mininode_lock, MY_VERSION
+    msg_filteradd, msg_filterclear, mininode_lock, MY_VERSION
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import initialize_chain_clean, start_nodes, \
     p2p_port, assert_equal
@@ -83,6 +83,20 @@ class NodeBloomTest(BitcoinTestFramework):
 
         time.sleep(3)
 
+        # Verify mininodes are still connected to zcashd nodes
+        peerinfo = self.nodes[0].getpeerinfo()
+        versions = [x["version"] for x in peerinfo]
+        assert_equal(1, versions.count(MY_VERSION))
+        peerinfo = self.nodes[1].getpeerinfo()
+        versions = [x["version"] for x in peerinfo]
+        assert_equal(1, versions.count(MY_VERSION))
+
+        # Mininodes send filteradd message to zcashd node.
+        nobf_node.send_message(msg_filteradd())
+        bf_node.send_message(msg_filteradd())
+
+        time.sleep(3)
+
         # Verify NoBF mininode has been dropped, and BF mininode is still connected.
         peerinfo = self.nodes[0].getpeerinfo()
         versions = [x["version"] for x in peerinfo]

qa/rpc-tests/test_framework/mininode.py

@@ -1263,6 +1263,22 @@ class msg_reject(object):
             % (self.message, self.code, self.reason, self.data)
 
 
+class msg_filteradd(object):
+    command = "filteradd"
+
+    def __init__(self):
+        self.data = ""
+
+    def deserialize(self, f):
+        self.data = deser_string(f)
+
+    def serialize(self):
+        return ser_string(self.data)
+
+    def __repr__(self):
+        return "msg_filteradd(data=%s)" % (repr(self.data))
+
+
 class msg_filterclear(object):
     command = "filterclear"