Skip to content

Commit

Permalink
Merge pull request #2151 from oscarguindzberg/getActiveKeychain-typo
Browse files Browse the repository at this point in the history
Fix getActiveKeyChain() typo
  • Loading branch information
ripcurlx authored Dec 20, 2018
2 parents a18ab4a + 6ab5487 commit 1835ea8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ public Transaction getPreparedUnlockTx(TxOutput lockupTxOutput) throws AddressFo
///////////////////////////////////////////////////////////////////////////////////////////

protected Set<Address> getAllAddressesFromActiveKeys() {
return wallet.getActiveKeychain().getLeafKeys().stream().
return wallet.getActiveKeyChain().getLeafKeys().stream().
map(key -> Address.fromP2SHHash(params, key.getPubKeyHash())).
collect(Collectors.toSet());
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/btc/wallet/WalletService.java
Original file line number Diff line number Diff line change
Expand Up @@ -575,12 +575,12 @@ public DeterministicKey freshKey(KeyChain.KeyPurpose purpose) {

@Nullable
public DeterministicKey findKeyFromPubKeyHash(byte[] pubKeyHash) {
return wallet.getActiveKeychain().findKeyFromPubHash(pubKeyHash);
return wallet.getActiveKeyChain().findKeyFromPubHash(pubKeyHash);
}

@Nullable
public DeterministicKey findKeyFromPubKey(byte[] pubKey) {
return wallet.getActiveKeychain().findKeyFromPubKey(pubKey);
return wallet.getActiveKeyChain().findKeyFromPubKey(pubKey);
}

public Address freshReceiveAddress() {
Expand Down

0 comments on commit 1835ea8

Please sign in to comment.