Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 05:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make BasicKeyChain.isWatching return a state enum instead and use it to simplify KeyChainGroup.isWatching()

Browse Source
This commit is contained in:
Mike Hearn
2015-04-16 16:41:33 +01:00
parent ed6821ed15
commit 54a6316243
2 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
View File

@@ -230,16 +230,23 @@ public class BasicKeyChain implements EncryptableKeyChain {
return pubkeyToKeys.size();
}
/** Whether this basic key chain is empty, full of regular (usable for signing) keys, or full of watching keys. */
public enum State {
EMPTY,
WATCHING,
REGULAR
}
/**
* Returns whether this chain consists entirely of watching keys (unencrypted keys with no private part). Mixed
* chains are forbidden. Null means the chain is empty.
* Returns whether this chain consists of pubkey only (watching) keys, regular keys (usable for signing), or
* has no keys in it yet at all (thus we cannot tell).
*/
public Boolean isWatching() {
public State isWatching() {
lock.lock();
try {
if (hashToKeys.isEmpty())
return null;
return isWatching;
return State.EMPTY;
return isWatching ? State.WATCHING : State.REGULAR;
} finally {
lock.unlock();
}

68
core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
View File

@@ -17,31 +17,21 @@
package org.bitcoinj.wallet;
import com.google.common.base.*;
import com.google.common.collect.*;
import com.google.protobuf.*;
import org.bitcoinj.core.*;
import org.bitcoinj.crypto.ChildNumber;
import org.bitcoinj.crypto.DeterministicKey;
import org.bitcoinj.crypto.KeyCrypter;
import org.bitcoinj.crypto.LinuxSecureRandom;
import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptBuilder;
import org.bitcoinj.store.UnreadableWalletException;
import org.bitcoinj.utils.ListenerRegistration;
import org.bitcoinj.utils.Threading;
import org.bitcoinj.crypto.*;
import org.bitcoinj.script.*;
import org.bitcoinj.store.*;
import org.bitcoinj.utils.*;
import org.slf4j.*;
import org.spongycastle.crypto.params.*;
import com.google.common.base.Joiner;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.protobuf.ByteString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.crypto.params.KeyParameter;
import javax.annotation.Nullable;
import java.security.SecureRandom;
import javax.annotation.*;
import java.security.*;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.*;
import static com.google.common.base.Preconditions.*;
@@ -555,24 +545,28 @@ public class KeyChainGroup implements KeyBag {
* Returns whether this chain has only watching keys (unencrypted keys with no private part). Mixed chains are
* forbidden.
*
* @throws IllegalStateException
* if there are no keys, or if there is a mix between watching and non-watching keys.
* @throws IllegalStateException if there are no keys, or if there is a mix between watching and non-watching keys.
*/
public boolean isWatching() {
Boolean basicChainIsWatching = basic.isWatching();
Boolean deterministicChainIsWatching = !chains.isEmpty() ? getActiveKeyChain().isWatching() : null;
if (basicChainIsWatching == null && deterministicChainIsWatching == null)
throw new IllegalStateException("No keys");
if (basicChainIsWatching == null && deterministicChainIsWatching != null)
return deterministicChainIsWatching;
if (basicChainIsWatching != null && deterministicChainIsWatching == null)
return basicChainIsWatching;
if (basicChainIsWatching == deterministicChainIsWatching)
return deterministicChainIsWatching;
if (basicChainIsWatching && !deterministicChainIsWatching)
throw new IllegalStateException("Basic chain is watching, deterministic chain is not");
BasicKeyChain.State basicState = basic.isWatching();
BasicKeyChain.State activeState = BasicKeyChain.State.EMPTY;
if (!chains.isEmpty()) {
if (getActiveKeyChain().isWatching())
activeState = BasicKeyChain.State.WATCHING;
else
throw new IllegalStateException("Basic chain is not watching, deterministic chain is");
activeState = BasicKeyChain.State.REGULAR;
}
if (basicState == BasicKeyChain.State.EMPTY) {
if (activeState == BasicKeyChain.State.EMPTY)
throw new IllegalStateException("Empty key chain group: cannot answer isWatching() query");
return activeState == BasicKeyChain.State.WATCHING;
} else if (activeState == BasicKeyChain.State.EMPTY)
return basicState == BasicKeyChain.State.WATCHING;
else {
if (activeState != basicState)
throw new IllegalStateException("Mix of watching and non-watching keys in wallet");
return activeState == BasicKeyChain.State.WATCHING;
}
}
/** Returns the key crypter or null if the group is not encrypted. */