From 34e2d1596f53c1c59ca8c66be008d30ae96d5749 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 7 Jan 2014 15:22:00 +0100 Subject: [PATCH] Address: rename a static ctor method to be more accurate. --- core/src/main/java/com/google/bitcoin/core/Address.java | 4 ++-- core/src/test/java/com/google/bitcoin/core/AddressTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/Address.java b/core/src/main/java/com/google/bitcoin/core/Address.java index f488f20d..be1ed9ca 100644 --- a/core/src/main/java/com/google/bitcoin/core/Address.java +++ b/core/src/main/java/com/google/bitcoin/core/Address.java @@ -56,7 +56,7 @@ public class Address extends VersionedChecksummedBytes { } /** Returns an Address that represents the given P2SH script hash. */ - public static Address fromP2SHScript(NetworkParameters params, byte[] hash160) { + public static Address fromP2SHHash(NetworkParameters params, byte[] hash160) { try { return new Address(params, params.getP2SHHeader(), hash160); } catch (WrongNetworkException e) { @@ -67,7 +67,7 @@ public class Address extends VersionedChecksummedBytes { /** Returns an Address that represents the script hash extracted from the given scriptPubKey */ public static Address fromP2SHScript(NetworkParameters params, Script scriptPubKey) { checkArgument(scriptPubKey.isPayToScriptHash(), "Not a P2SH script"); - return fromP2SHScript(params, scriptPubKey.getPubKeyHash()); + return fromP2SHHash(params, scriptPubKey.getPubKeyHash()); } /** diff --git a/core/src/test/java/com/google/bitcoin/core/AddressTest.java b/core/src/test/java/com/google/bitcoin/core/AddressTest.java index e1a7e4b1..cac1ad96 100644 --- a/core/src/test/java/com/google/bitcoin/core/AddressTest.java +++ b/core/src/test/java/com/google/bitcoin/core/AddressTest.java @@ -112,9 +112,9 @@ public class AddressTest { // Test that we can convert them from hashes byte[] hex = Hex.decode("2ac4b0b501117cc8119c5797b519538d4942e90e"); - Address a = Address.fromP2SHScript(mainParams, hex); + Address a = Address.fromP2SHHash(mainParams, hex); assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", a.toString()); - Address b = Address.fromP2SHScript(testParams, Hex.decode("18a0e827269b5211eb51a4af1b2fa69333efa722")); + Address b = Address.fromP2SHHash(testParams, Hex.decode("18a0e827269b5211eb51a4af1b2fa69333efa722")); assertEquals("2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe", b.toString()); Address c = Address.fromP2SHScript(mainParams, ScriptBuilder.createP2SHOutputScript(hex)); assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", c.toString());