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

Wallet.isConsistentOrThrow(): New variant of .isConsistent() that throws an exception describing the inconsistency.

Browse Source
This commit is contained in:
Andreas Schildbach
2016-02-16 20:44:43 +01:00
parent d27ca30516
commit eefd513e84
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@@ -1456,10 +1456,32 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
}
}
/**
* Returns if this wallet is structurally consistent, so e.g. no duplicate transactions. First inconsistency and a
* dump of the wallet will be logged.
*/
public boolean isConsistent() {
try {
isConsistentOrThrow();
return true;
} catch (IllegalStateException x) {
log.error(x.getMessage());
try {
log.error(toString());
} catch (RuntimeException x2) {
log.error("Printing inconsistent wallet failed", x2);
}
return false;
}
}
/**
* Variant of {@link Wallet#isConsistent()} that throws an {@link IllegalStateException} describing the first
* inconsistency.
*/
public void isConsistentOrThrow() throws IllegalStateException {
lock.lock();
try {
boolean success = true;
Set<Transaction> transactions = getTransactions(true);
Set<Sha256Hash> hashes = new HashSet<Sha256Hash>();
@@ -1468,40 +1490,26 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
}
int size1 = transactions.size();
if (size1 != hashes.size()) {
log.error("Two transactions with same hash");
success = false;
throw new IllegalStateException("Two transactions with same hash");
}
int size2 = unspent.size() + spent.size() + pending.size() + dead.size();
if (size1 != size2) {
log.error("Inconsistent wallet sizes: {} {}", size1, size2);
success = false;
throw new IllegalStateException("Inconsistent wallet sizes: " + size1 + ", " + size2);
}
for (Transaction tx : unspent.values()) {
if (!tx.isConsistent(this, false)) {
success = false;
log.error("Inconsistent unspent tx {}", tx.getHashAsString());
throw new IllegalStateException("Inconsistent unspent tx: " + tx.getHashAsString());
}
}
for (Transaction tx : spent.values()) {
if (!tx.isConsistent(this, true)) {
success = false;
log.error("Inconsistent spent tx {}", tx.getHashAsString());
throw new IllegalStateException("Inconsistent spent tx: " + tx.getHashAsString());
}
}
if (!success) {
try {
log.error(toString());
} catch (RuntimeException x) {
log.error("Printing inconsistent wallet failed", x);
}
}
return success;
} finally {
lock.unlock();
}
@@ -1891,7 +1899,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
}
informConfidenceListenersIfNotReorganizing();
checkState(isConsistent());
isConsistentOrThrow();
saveNow();
}
@@ -2245,7 +2253,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
throw new RuntimeException(e);
}
checkState(isConsistent());
isConsistentOrThrow();
informConfidenceListenersIfNotReorganizing();
saveNow();
} finally {
@@ -2665,7 +2673,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
}
}
if (dirty) {
checkState(isConsistent());
isConsistentOrThrow();
saveLater();
}
} finally {
@@ -4201,7 +4209,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
}
notifyNewBestBlock(block);
}
checkState(isConsistent());
isConsistentOrThrow();
final Coin balance = getBalance();
log.info("post-reorg balance is {}", balance.toFriendlyString());
// Inform event listeners that a re-org took place.