Merge #234: Fix file location of .cookie when on testnet

bd3607d Fix file location of .cookie when on testnet (JSwambo)

Pull request description:

  The data directory for the cookie file used for authentication should be `~/.bitcoin/testnet3` when connecting to bitcoin core testnet through RPC.

Top commit has no ACKs.

Tree-SHA512: eba0cf45793b308636331d4657994fc7ba2b7814ec48d5580540d7f2f85dedbff167038f34586832d54579f610bc3310563b3a9ba4a5e700747ac6a2b129818d

Author: petertodd

bitcoin/rpc.py

@@ -183,7 +183,9 @@ def __init__(self,
                 ('http', conf['rpchost'], conf['rpcport']))
 
             cookie_dir = conf.get('datadir', os.path.dirname(btc_conf_file))
-            if bitcoin.params.NAME != "mainnet":
+            if bitcoin.params.NAME == 'testnet':
+                cookie_dir = os.path.join(cookie_dir, 'testnet3')
+            elif bitcoin.params.NAME == 'regtest':
                 cookie_dir = os.path.join(cookie_dir, bitcoin.params.NAME)
             cookie_file = os.path.join(cookie_dir, ".cookie")
             try: