Revert "tmp"

This reverts commit 9a73260.
p2pool · Jun 20, 2014 · 1a0e04a · 1a0e04a
1 parent 17082a6
commit 1a0e04a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/p2pool/bitcoin/data.py b/p2pool/bitcoin/data.py
@@ -258,12 +258,9 @@ def pubkey_to_address(pubkey, net):
 
 def address_to_pubkey_hash(address, net):
     x = human_address_type.unpack(base58_decode(address))
-    if x['version'] == net.ADDRESS_VERSION:
-        return x['pubkey_hash']
-    elif x['version'] == net.ADDRESS_VERSION + 5:
-        return x['pubkey_hash'] # XXX script hash - handle specially
-    else:
-        raise ValueError('address not for this net! %r' % (address,))
+    if x['version'] != net.ADDRESS_VERSION:
+        raise ValueError('address not for this net!')
+    return x['pubkey_hash']
 
 # transactions