Merge #210: Added generatetoaddress(self,numblocks,addr) to rpc.py

6fa8b95 Added generatetoaddress(self,numblocks,addr), replacing generate(self,numblocks) which will be dropped in bitcoin-core v0.19 (alexei.zamyatin)

Pull request description:

  Fixing #209
  Added `generatetoaddress(self,numblocks,addr)` to rpc.py, which should replace `generate(self,numblocks)`. The latter will be dropped in bitcoin-core v0.19.
  Keeping `generate(self,numblocks)` for now (for backward compatibility)

Tree-SHA512: cfd676fa852c57663186b952d6c0015cbc8d6f79f532b061c438389db6bff33489b8d18ce87cb4205a69b9b78d9688fd94f9dc698d2b895b989f23706014b817

Author: petertodd

bitcoin/rpc.py

@@ -381,14 +381,30 @@ def fundrawtransaction(self, tx, include_watching=False):
         return r
 
     def generate(self, numblocks):
-        """Mine blocks immediately (before the RPC call returns)
+        """
+        DEPRECATED (will be removed in bitcoin-core v0.19)
+        
+        Mine blocks immediately (before the RPC call returns)
 
         numblocks - How many blocks are generated immediately.
 
         Returns iterable of block hashes generated.
         """
         r = self._call('generate', numblocks)
         return (lx(blk_hash) for blk_hash in r)
+    
+    def generatetoaddress(self, numblocks, addr):
+        """Mine blocks immediately (before the RPC call returns) and
+        allocate block reward to passed address. Replaces deprecated 
+        "generate(self,numblocks)" method.
+
+        numblocks - How many blocks are generated immediately.
+        addr     - Address to receive block reward (CBitcoinAddress instance)
+
+        Returns iterable of block hashes generated.
+        """
+        r = self._call('generatetoaddress', numblocks, str(addr))
+        return (lx(blk_hash) for blk_hash in r)
 
     def getaccountaddress(self, account=None):
         """Return the current Bitcoin address for receiving payments to this