mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 21:32:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

MarriedKeyChain: simplify Builder.followingKeys()

Browse Source 
* Add `followingKey()` method that takes a single key
* Deprecate unused `followingKeys(DeterministicKey, DeterministicKey...)`
* Replace usage of Guava's `Lists.asList()`
This commit is contained in:
Sean Gilligan 2023-03-26 09:31:52 -07:00 committed by Andreas Schildbach
parent 6e1fc2cda9
commit c05fefe8f8
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java
View File

@ -16,7 +16,6 @@
package org.bitcoinj.wallet;
import com.google.common.collect.Lists;
import com.google.protobuf.ByteString;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.crypto.AesKey;
@ -32,6 +31,7 @@ import org.bitcoinj.script.ScriptBuilder;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@ -71,13 +71,25 @@ public class MarriedKeyChain extends DeterministicKeyChain {
protected Builder() {
}
public T followingKey(DeterministicKey followingKey) {
this.followingKeys = Collections.singletonList(followingKey);
return self();
}
public T followingKeys(List<DeterministicKey> followingKeys) {
this.followingKeys = followingKeys;
return self();
}
/**
* @deprecated Merge the elements and call {@link #followingKeys(List)}
*/
@Deprecated
public T followingKeys(DeterministicKey followingKey, DeterministicKey ...followingKeys) {
this.followingKeys = Lists.asList(followingKey, followingKeys);
List<DeterministicKey> tempList = new ArrayList<>();
tempList.add(followingKey);
tempList.addAll(Arrays.asList(followingKeys));
this.followingKeys = tempList;
return self();
}

2
core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
View File

@ -370,7 +370,7 @@ public class WalletProtobufSerializerTest {
DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, partnerChain.getWatchingKey().serializePubB58(TESTNET.network()), TESTNET.network());
MarriedKeyChain chain = MarriedKeyChain.builder()
.random(new SecureRandom())
.followingKeys(partnerKey)
.followingKey(partnerKey)
.threshold(2).build();
myWallet.addAndActivateHDChain(chain);

2
core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
View File

@ -110,7 +110,7 @@ public class KeyChainGroupTest {
DeterministicSeed seed = DeterministicSeed.ofEntropy(entropy, "", Instant.ofEpochSecond(MnemonicCode.BIP39_STANDARDISATION_TIME_SECS));
MarriedKeyChain chain = MarriedKeyChain.builder()
.seed(seed)
.followingKeys(watchingAccountKey)
.followingKey(watchingAccountKey)
.threshold(2).build();
return chain;
}

2
core/src/test/java/org/bitcoinj/wallet/WalletTest.java
View File

@ -3325,7 +3325,7 @@ public class WalletTest extends TestWithWallet {
wallet.addTransactionSigner(signer);
MarriedKeyChain chain = MarriedKeyChain.builder()
.random(new SecureRandom())
.followingKeys(partnerKey)
.followingKey(partnerKey)
.build();
wallet.addAndActivateHDChain(chain);