sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-26 01:56:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

walletnode toString refactor

Browse source
This commit is contained in:
Craig Raw 2021-10-27 12:00:02 +02:00
parent 99440eda7f
commit 24d9e5fcda
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -1038,7 +1038,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
for(TransactionInput txInput : signingNodes.keySet()) { for(TransactionInput txInput : signingNodes.keySet()) {
WalletNode walletNode = signingNodes.get(txInput); WalletNode walletNode = signingNodes.get(txInput);
Map<ECKey, Keystore> keystoreKeysForNode = getKeystores().stream().collect(Collectors.toMap(keystore -> getScriptType().getOutputKey(keystore.getPubKey(walletNode)), Function.identity(), Map<ECKey, Keystore> keystoreKeysForNode = getKeystores().stream().collect(Collectors.toMap(keystore -> getScriptType().getOutputKey(keystore.getPubKey(walletNode)), Function.identity(),
(u, v) -> { throw new IllegalStateException("Duplicate keys from different keystores for node " + walletNode.getDerivationPath()); }, (u, v) -> { throw new IllegalStateException("Duplicate keys from different keystores for node " + walletNode); },
LinkedHashMap::new)); LinkedHashMap::new));
Map<ECKey, TransactionSignature> keySignatureMap = new LinkedHashMap<>(); Map<ECKey, TransactionSignature> keySignatureMap = new LinkedHashMap<>();
@ -1138,7 +1138,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
for(PSBTInput psbtInput : signingNodes.keySet()) { for(PSBTInput psbtInput : signingNodes.keySet()) {
WalletNode walletNode = signingNodes.get(psbtInput); WalletNode walletNode = signingNodes.get(psbtInput);
Map<ECKey, Keystore> keystoreKeysForNode = getKeystores().stream().collect(Collectors.toMap(keystore -> getScriptType().getOutputKey(keystore.getPubKey(walletNode)), Function.identity(), Map<ECKey, Keystore> keystoreKeysForNode = getKeystores().stream().collect(Collectors.toMap(keystore -> getScriptType().getOutputKey(keystore.getPubKey(walletNode)), Function.identity(),
(u, v) -> { throw new IllegalStateException("Duplicate keys from different keystores for node " + walletNode.getDerivationPath()); }, (u, v) -> { throw new IllegalStateException("Duplicate keys from different keystores for node " + walletNode); },
LinkedHashMap::new)); LinkedHashMap::new));
Map<ECKey, TransactionSignature> keySignatureMap; Map<ECKey, TransactionSignature> keySignatureMap;

2
src/main/java/com/sparrowwallet/drongo/wallet/WalletNode.java
View file

@ -158,7 +158,7 @@ public class WalletNode extends Persistable implements Comparable<WalletNode> {
@Override @Override
public String toString() { public String toString() {
return derivationPath; return derivationPath.replace("m", "..");
} }
@Override @Override