Various cleanups and add p2p tests to the pull tester.

Remove unnecessary blockstore imports
Fix setgenerate -> generate in rpc tests
Reduce test iterations in maxblocksinflight
Add some p2p tests to pull-tester.

qa/pull-tester/rpc-tests.sh

@@ -30,6 +30,8 @@ testScripts=(
     'proxy_test.py'
     'merkle_blocks.py'
 #    'forknotify.py'
+    'maxblocksinflight.py'
+    'invalidblockrequest.py'
 );
 if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
     for (( i = 0; i < ${#testScripts[@]}; i++ ))

qa/rpc-tests/bipdersig-p2p.py

@@ -74,7 +74,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
 
     def get_tests(self):
 
-        self.coinbase_blocks = self.nodes[0].setgenerate(True, 2)
+        self.coinbase_blocks = self.nodes[0].generate(2)
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = time.time()

qa/rpc-tests/invalidblockrequest.py

@@ -9,7 +9,6 @@
 from comptool import TestManager, TestInstance
 from mininode import *
 from blocktools import *
-from blockstore import BlockStore
 import logging
 import copy
 import time

qa/rpc-tests/maxblocksinflight.py

@@ -44,9 +44,9 @@ def add_new_connection(self, connection):
     def run(self):
         try:
             fail = False
-            self.connection.rpc.setgenerate(True, 1) # Leave IBD
+            self.connection.rpc.generate(1) # Leave IBD
 
-            numBlocksToGenerate = [ 8, 16, 128, 512, 1024, 4096, 8192, 40000, 80000 ]
+            numBlocksToGenerate = [ 8, 16, 128, 1024 ]
             for count in range(len(numBlocksToGenerate)):
                 current_invs = []
                 for i in range(numBlocksToGenerate[count]):

qa/rpc-tests/script_test.py

@@ -24,7 +24,6 @@
 from comptool import TestInstance, TestManager
 from mininode import *
 from blocktools import *
-from blockstore import BlockStore, TxStore
 from script import *
 import logging
 import copy