Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-16 20:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "PeerFilterProvider methods are called with the lock already held, so just assert on that instead of locking again."

Browse Source 
This reverts commit e888807dfd.
This commit is contained in:
Mike Hearn
2014-08-13 14:47:15 +02:00
parent 1ba5909687
commit e1f270f726
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@@ -3648,7 +3648,6 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
*/
@Override
public int getBloomFilterElementCount() {
checkState(lock.isHeldByCurrentThread());
int size = keychain.getBloomFilterElementCount();
for (Transaction tx : getTransactions(false)) {
for (TransactionOutput out : tx.getOutputs()) {
@@ -3675,7 +3674,6 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
*/
@Override
public boolean isRequiringUpdateAllBloomFilter() {
checkState(lock.isHeldByCurrentThread());
return !watchedScripts.isEmpty();
}
@@ -3700,17 +3698,23 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
*/
@Override
public BloomFilter getBloomFilter(int size, double falsePositiveRate, long nTweak) {
checkState(lock.isHeldByCurrentThread());
BloomFilter filter = keychain.getBloomFilter(size, falsePositiveRate, nTweak);
for (Script script : watchedScripts) {
for (ScriptChunk chunk : script.getChunks()) {
// Only add long (at least 64 bit) data to the bloom filter.
// If any long constants become popular in scripts, we will need logic
// here to exclude them.
if (!chunk.isOpCode() && chunk.data.length >= MINIMUM_BLOOM_DATA_LENGTH) {
filter.insert(chunk.data);
BloomFilter filter;
lock.lock();
try {
filter = keychain.getBloomFilter(size, falsePositiveRate, nTweak);
for (Script script : watchedScripts) {
for (ScriptChunk chunk : script.getChunks()) {
// Only add long (at least 64 bit) data to the bloom filter.
// If any long constants become popular in scripts, we will need logic
// here to exclude them.
if (!chunk.isOpCode() && chunk.data.length >= MINIMUM_BLOOM_DATA_LENGTH) {
filter.insert(chunk.data);
}
}
}
} finally {
lock.unlock();
}
for (Transaction tx : getTransactions(false)) {
for (int i = 0; i < tx.getOutputs().size(); i++) {