From 53908d8939b8186a6d6243ae8d10daa72c537515 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 1 Feb 2019 17:41:31 +0100 Subject: [PATCH] KeyBag, TransactionBag: Rename parameters pubkey to pubKey, pubkeyHash to pubKeyHash. --- .../java/org/bitcoinj/core/TransactionBag.java | 4 ++-- .../org/bitcoinj/wallet/DecryptingKeyBag.java | 8 ++++---- .../main/java/org/bitcoinj/wallet/KeyBag.java | 4 ++-- .../org/bitcoinj/wallet/KeyChainGroup.java | 18 +++++++++--------- .../main/java/org/bitcoinj/wallet/Wallet.java | 16 ++++++++-------- .../bitcoinj/examples/GenerateLowSTests.java | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBag.java b/core/src/main/java/org/bitcoinj/core/TransactionBag.java index dfbf0592..608d782e 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBag.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionBag.java @@ -27,13 +27,13 @@ import java.util.Map; */ public interface TransactionBag { /** Returns true if this wallet contains a public key which hashes to the given hash. */ - boolean isPubKeyHashMine(byte[] pubkeyHash); + boolean isPubKeyHashMine(byte[] pubKeyHash); /** Returns true if this wallet is watching transactions for outputs with the script. */ boolean isWatchedScript(Script script); /** Returns true if this wallet contains a keypair with the given public key. */ - boolean isPubKeyMine(byte[] pubkey); + boolean isPubKeyMine(byte[] pubKey); /** Returns true if this wallet knows the script corresponding to the given hash. */ boolean isPayToScriptHashMine(byte[] payToScriptHash); diff --git a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java index 320a6df5..487d4448 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java +++ b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java @@ -63,14 +63,14 @@ public class DecryptingKeyBag implements KeyBag { @Nullable @Override - public ECKey findKeyFromPubHash(byte[] pubkeyHash) { - return maybeDecrypt(target.findKeyFromPubHash(pubkeyHash)); + public ECKey findKeyFromPubHash(byte[] pubKeyHash) { + return maybeDecrypt(target.findKeyFromPubHash(pubKeyHash)); } @Nullable @Override - public ECKey findKeyFromPubKey(byte[] pubkey) { - return maybeDecrypt(target.findKeyFromPubKey(pubkey)); + public ECKey findKeyFromPubKey(byte[] pubKey) { + return maybeDecrypt(target.findKeyFromPubKey(pubKey)); } @Nullable diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java index 684f1330..e3914099 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java @@ -32,7 +32,7 @@ public interface KeyBag { * @return ECKey object or null if no such key was found. */ @Nullable - ECKey findKeyFromPubHash(byte[] pubkeyHash); + ECKey findKeyFromPubHash(byte[] pubKeyHash); /** * Locates a keypair from the keychain given the raw public key bytes. @@ -40,7 +40,7 @@ public interface KeyBag { * @return ECKey or null if no such key was found. */ @Nullable - ECKey findKeyFromPubKey(byte[] pubkey); + ECKey findKeyFromPubKey(byte[] pubKey); /** * Locates a redeem data (redeem script and keys) from the keychain given the hash of the script. diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index e0258014..d9f9b5ff 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -388,25 +388,25 @@ public class KeyChainGroup implements KeyBag { @Nullable @Override - public ECKey findKeyFromPubHash(byte[] pubkeyHash) { + public ECKey findKeyFromPubHash(byte[] pubKeyHash) { ECKey result; - if ((result = basic.findKeyFromPubHash(pubkeyHash)) != null) + if ((result = basic.findKeyFromPubHash(pubKeyHash)) != null) return result; for (DeterministicKeyChain chain : chains) { - if ((result = chain.findKeyFromPubHash(pubkeyHash)) != null) + if ((result = chain.findKeyFromPubHash(pubKeyHash)) != null) return result; } return null; } /** - * Mark the DeterministicKeys as used, if they match the pubkeyHash + * Mark the DeterministicKeys as used, if they match the pubKeyHash * See {@link DeterministicKeyChain#markKeyAsUsed(DeterministicKey)} for more info on this. */ - public void markPubKeyHashAsUsed(byte[] pubkeyHash) { + public void markPubKeyHashAsUsed(byte[] pubKeyHash) { for (DeterministicKeyChain chain : chains) { DeterministicKey key; - if ((key = chain.markPubHashAsUsed(pubkeyHash)) != null) { + if ((key = chain.markPubHashAsUsed(pubKeyHash)) != null) { maybeMarkCurrentKeyAsUsed(key); return; } @@ -449,12 +449,12 @@ public class KeyChainGroup implements KeyBag { @Nullable @Override - public ECKey findKeyFromPubKey(byte[] pubkey) { + public ECKey findKeyFromPubKey(byte[] pubKey) { ECKey result; - if ((result = basic.findKeyFromPubKey(pubkey)) != null) + if ((result = basic.findKeyFromPubKey(pubKey)) != null) return result; for (DeterministicKeyChain chain : chains) { - if ((result = chain.findKeyFromPubKey(pubkey)) != null) + if ((result = chain.findKeyFromPubKey(pubKey)) != null) return result; } return null; diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java index a7aee6f1..0fa0f1cd 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java +++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java @@ -997,10 +997,10 @@ public class Wallet extends BaseTaggableObject */ @Override @Nullable - public ECKey findKeyFromPubHash(byte[] pubkeyHash) { + public ECKey findKeyFromPubHash(byte[] pubKeyHash) { keyChainGroupLock.lock(); try { - return keyChainGroup.findKeyFromPubHash(pubkeyHash); + return keyChainGroup.findKeyFromPubHash(pubKeyHash); } finally { keyChainGroupLock.unlock(); } @@ -1028,8 +1028,8 @@ public class Wallet extends BaseTaggableObject } @Override - public boolean isPubKeyHashMine(byte[] pubkeyHash) { - return findKeyFromPubHash(pubkeyHash) != null; + public boolean isPubKeyHashMine(byte[] pubKeyHash) { + return findKeyFromPubHash(pubKeyHash) != null; } @Override @@ -1060,18 +1060,18 @@ public class Wallet extends BaseTaggableObject */ @Override @Nullable - public ECKey findKeyFromPubKey(byte[] pubkey) { + public ECKey findKeyFromPubKey(byte[] pubKey) { keyChainGroupLock.lock(); try { - return keyChainGroup.findKeyFromPubKey(pubkey); + return keyChainGroup.findKeyFromPubKey(pubKey); } finally { keyChainGroupLock.unlock(); } } @Override - public boolean isPubKeyMine(byte[] pubkey) { - return findKeyFromPubKey(pubkey) != null; + public boolean isPubKeyMine(byte[] pubKey) { + return findKeyFromPubKey(pubKey) != null; } /** diff --git a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java index e7493da5..a68c1c98 100644 --- a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java +++ b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java @@ -64,12 +64,12 @@ public class GenerateLowSTests { final ECKey key = new ECKey(secureRandom); final KeyBag bag = new KeyBag() { @Override - public ECKey findKeyFromPubHash(byte[] pubkeyHash) { + public ECKey findKeyFromPubHash(byte[] pubKeyHash) { return key; } @Override - public ECKey findKeyFromPubKey(byte[] pubkey) { + public ECKey findKeyFromPubKey(byte[] pubKey) { return key; }