full method names are better

Author: andkom

src/ScriptPubKey.php

@@ -27,7 +27,7 @@ public function isReturn(): bool
     /**
      * @return bool
      */
-    public function isP2PK(): bool
+    public function isPayToPubKey(): bool
     {
         $operations = $this->parse();
 
@@ -39,7 +39,7 @@ public function isP2PK(): bool
     /**
      * @return bool
      */
-    public function isP2PKH(): bool
+    public function isPayToPubKeyHash(): bool
     {
         $operations = $this->parse();
 
@@ -54,7 +54,7 @@ public function isP2PKH(): bool
     /**
      * @return bool
      */
-    public function isP2SH(): bool
+    public function isPayToScriptHash(): bool
     {
         $operations = $this->parse();
 
@@ -80,7 +80,7 @@ public function isMultisig(): bool
     /**
      * @return bool
      */
-    public function isP2WPKH(): bool
+    public function isPayToWitnessPubKeyHash(): bool
     {
         $operations = $this->parse();
 
@@ -92,7 +92,7 @@ public function isP2WPKH(): bool
     /**
      * @return bool
      */
-    public function isP2WSH(): bool
+    public function isPayToWitnessScriptHash(): bool
     {
         $operations = $this->parse();
 
@@ -115,23 +115,23 @@ public function getOutputAddress(Bitcoin $network = null): string
 
         $operations = $this->parse();
 
-        if ($this->isP2PK()) {
+        if ($this->isPayToPubKey()) {
             return Utils::pubKeyToAddress($operations[0]->data, $network::P2PKH_PREFIX);
         }
 
-        if ($this->isP2PKH()) {
+        if ($this->isPayToPubKeyHash()) {
             return Utils::hash160ToAddress($operations[2]->data, $network::P2PKH_PREFIX);
         }
 
-        if ($this->isP2SH()) {
+        if ($this->isPayToScriptHash()) {
             return Utils::hash160ToAddress($operations[1]->data, $network::P2SH_PREFIX);
         }
 
-        if ($this->isP2WPKH()) {
+        if ($this->isPayToWitnessPubKeyHash()) {
             return encodeSegwit($network::BECH32_HRP, $operations[0]->data, $operations[1]->data);
         }
 
-        if ($this->isP2WSH()) {
+        if ($this->isPayToWitnessScriptHash()) {
             return encodeSegwit($network::BECH32_HRP, $operations[0]->data, $operations[1]->data);
         }
 

tests/ScriptPubKeyTest.php

@@ -28,7 +28,7 @@ public function testParseP2PK()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2PK());
+        $this->assertTrue($script->isPayToPubKey());
         $this->assertEquals($script->getOutputAddress(), '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm');
     }
 
@@ -41,7 +41,7 @@ public function testParseP2PKCompressed()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2PK());
+        $this->assertTrue($script->isPayToPubKey());
         $this->assertEquals($script->getOutputAddress(), '1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH');
     }
 
@@ -57,7 +57,7 @@ public function testParseP2PKH()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2PKH());
+        $this->assertTrue($script->isPayToPubKeyHash());
         $this->assertEquals($script->getOutputAddress(), '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm');
     }
 
@@ -71,7 +71,7 @@ public function testParseP2SH()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2SH());
+        $this->assertTrue($script->isPayToScriptHash());
         $this->assertEquals($script->getOutputAddress(), '3EyPVdtVrtMJ1XwPT9oiBrQysGpRY8LE9K');
     }
 
@@ -102,7 +102,7 @@ public function testParseP2WPKH()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2WPKH());
+        $this->assertTrue($script->isPayToWitnessPubKeyHash());
         $this->assertEquals($script->getOutputAddress(), 'bc1q2djj8vu2ypensaq8jlxs8se396q5pr2n3sa2wn');
     }
 
@@ -115,7 +115,7 @@ public function testParseP2WSH()
 
         $script = new ScriptPubKey(hex2bin($hex));
 
-        $this->assertTrue($script->isP2WSH());
+        $this->assertTrue($script->isPayToWitnessScriptHash());
         $this->assertEquals($script->getOutputAddress(), 'bc1qwqdg6squsna38e46795at95yu9atm8azzmyvckulcc7kytlcckxswvvzej');
     }
 }