From 9c30bab375b04422539ad9d83bf2f8f482a71a65 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Sat, 6 Aug 2022 10:53:19 -0700 Subject: [PATCH] TransactionOutput: remove deprecated getAddressFrom* methods Remove deprecated `getAddressFromP2PKHScript()` and `getAddressFromP2SH()` methods They have been deprecated for more than one release. --- .../org/bitcoinj/core/TransactionOutput.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java index ff4c2543a..cb8232c49 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java @@ -128,23 +128,6 @@ public class TransactionOutput extends ChildMessage { return scriptPubKey; } - @Nullable - @Deprecated - public LegacyAddress getAddressFromP2PKHScript(NetworkParameters params) throws ScriptException { - if (ScriptPattern.isP2PKH(getScriptPubKey())) - return LegacyAddress.fromPubKeyHash(params, - ScriptPattern.extractHashFromP2PKH(getScriptPubKey())); - return null; - } - - @Nullable - @Deprecated - public LegacyAddress getAddressFromP2SH(NetworkParameters params) throws ScriptException { - if (ScriptPattern.isP2SH(getScriptPubKey())) - return LegacyAddress.fromScriptHash(params, ScriptPattern.extractHashFromP2SH(getScriptPubKey())); - return null; - } - @Override protected void parse() throws ProtocolException { value = readInt64();