From: Forrest Voight <forrest@forre.st>
Date: Mon, 15 Oct 2012 06:35:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into tx_preforwarding
X-Git-Tag: 8.0^2~2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=414e981a3859c911f459027fa7869bcd8666469a;hp=a6479af11628b39441f9f93825583982c138b829;p=p2pool.git

Merge remote-tracking branch 'origin/master' into tx_preforwarding
---

diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py
index b46f3f9..6e074f3 100644
--- a/p2pool/bitcoin/networks.py
+++ b/p2pool/bitcoin/networks.py
@@ -29,7 +29,7 @@ nets = dict(
         P2P_PREFIX='0b110907'.decode('hex'),
         P2P_PORT=18333,
         ADDRESS_VERSION=111,
-        RPC_PORT=8332,
+        RPC_PORT=18332,
         RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'bitcoinaddress' in (yield bitcoind.rpc_help()) and
             (yield bitcoind.rpc_getinfo())['testnet']