batching compatible w get_content

hive/indexer/http_client.py

@@ -17,7 +17,7 @@ from urllib3.connection import HTTPConnection
 from urllib3.exceptions import MaxRetryError, ReadTimeoutError, ProtocolError
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
+logger.setLevel(logging.WARNING)
 
 class RPCError(Exception):
     pass
@@ -109,7 +109,7 @@ class HttpClient(object):
         self.request = None
         self.next_node()
 
-        log_level = kwargs.get('log_level', logging.DEBUG)
+        log_level = kwargs.get('log_level', logging.WARNING)
         logger.setLevel(log_level)
 
     def next_node(self):
@@ -256,9 +256,9 @@ class HttpClient(object):
 
         batch_requests = ({
                 "method": name,
-                "params": [i],
+                "params": i,
                 "jsonrpc": "2.0",
-                "id": i
+                "id": 0
             } for i in params)
 
 

hive/indexer/utils.py

@@ -43,7 +43,7 @@ class SteemAdapter:
         return self.__exec('get_accounts', accounts)
 
     def get_content_batch(self, tuples):
-        return self.__exec_multi('get_content', tuples)
+        return self.__exec_batch('get_content', tuples)
 
     def get_block(self, num):
         return self.__exec('get_block', num)
@@ -69,10 +69,10 @@ class SteemAdapter:
         blocks = {}
 
         while missing:
-            for block in self.__exec_batch('get_block', missing):
+            for block in self.__exec_batch('get_block', [[i] for i in missing]):
                 blocks[int(block['block_id'][:8], base=16)] = block
-                available = set(blocks.keys())
-                missing = required - available
+            available = set(blocks.keys())
+            missing = required - available
             if missing:
                 print("WARNING: API missed blocks {}".format(missing))
                 time.sleep(3)
@@ -86,4 +86,4 @@ class SteemAdapter:
         return self._client.exec(method, *params)
 
     def __exec_batch(self, method, params):
-        return self._client.exec_batch(method, params)
\ No newline at end of file
+        return self._client.exec_batch(method, params)