From caf9e529400a1f43842a92b18f0ecbf500c641c7 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Sun, 25 Feb 2018 22:12:39 +0100
Subject: [PATCH] ScriptPattern: Rename some matcher methods to the typical
 name of the matched scripts.

---
 core/src/main/java/org/bitcoinj/script/Script.java            | 4 ++--
 core/src/main/java/org/bitcoinj/script/ScriptPattern.java     | 4 ++--
 core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/bitcoinj/script/Script.java
index aa8742f7..892cd151 100644
--- a/core/src/main/java/org/bitcoinj/script/Script.java
+++ b/core/src/main/java/org/bitcoinj/script/Script.java
@@ -233,7 +233,7 @@ public class Script {
      * useful more exotic types of transaction, but today most payments are to addresses.
      */
     public boolean isSentToRawPubKey() {
-        return ScriptPattern.isSentToRawPubKey(chunks);
+        return ScriptPattern.isPayToPubKey(chunks);
     }
 
     /**
@@ -243,7 +243,7 @@ public class Script {
      * way to make payments due to the short and recognizable base58 form addresses come in.
      */
     public boolean isSentToAddress() {
-        return ScriptPattern.isSentToAddress(chunks);
+        return ScriptPattern.isPayToPubKeyHash(chunks);
     }
 
     /**
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptPattern.java b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java
index 048cd173..d46f6010 100644
--- a/core/src/main/java/org/bitcoinj/script/ScriptPattern.java
+++ b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java
@@ -27,7 +27,7 @@ import static org.bitcoinj.script.ScriptOpCodes.*;
  * This is a Script pattern matcher with some typical script patterns
  */
 public class ScriptPattern {
-    public static boolean isSentToAddress(List<ScriptChunk> chunks) {
+    public static boolean isPayToPubKeyHash(List<ScriptChunk> chunks) {
         return chunks.size() == 5 &&
                chunks.get(0).equalsOpCode(OP_DUP) &&
                chunks.get(1).equalsOpCode(OP_HASH160) &&
@@ -51,7 +51,7 @@ public class ScriptPattern {
                chunks.get(2).equalsOpCode(OP_EQUAL);
     }
 
-    public static boolean isSentToRawPubKey(List<ScriptChunk> chunks) {
+    public static boolean isPayToPubKey(List<ScriptChunk> chunks) {
         return chunks.size() == 2 &&
                chunks.get(1).equalsOpCode(OP_CHECKSIG) &&
                !chunks.get(0).isOpCode() &&
diff --git a/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java b/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
index 9e413be4..bb1525e5 100644
--- a/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
+++ b/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
@@ -31,7 +31,7 @@ public class ScriptPatternTest {
 
     @Test
     public void testCommonScripts() {
-        assertTrue(ScriptPattern.isSentToAddress(
+        assertTrue(ScriptPattern.isPayToPubKeyHash(
                 ScriptBuilder.createOutputScript(keys.get(0).toAddress(MainNetParams.get())).getChunks()
         ));
         assertTrue(ScriptPattern.isPayToScriptHash(
@@ -40,7 +40,7 @@ public class ScriptPatternTest {
         assertTrue(ScriptPattern.isSentToMultisig(
                 ScriptBuilder.createMultiSigOutputScript(2, keys).getChunks()
         ));
-        assertTrue(ScriptPattern.isSentToRawPubKey(
+        assertTrue(ScriptPattern.isPayToPubKey(
                 ScriptBuilder.createOutputScript(keys.get(0)).getChunks()
         ));
         assertTrue(ScriptPattern.isSentToCltvPaymentChannel(