Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 10:45:51 +00:00
Code Issues Projects Releases Wiki Activity

SPVBlockStore: Make getFileSize() a static method for computing size before creating/outside instance.

Browse Source
This commit is contained in:
Jarl Fransson 2016-10-12 15:07:42 +02:00 committed by Andreas Schildbach
parent 3d06dd9802
commit 1a274ce7a1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
View File

@ -107,7 +107,7 @@ public class SPVBlockStore implements BlockStore {
boolean exists = file.exists(); boolean exists = file.exists();
// Set up the backing file. // Set up the backing file.
randomAccessFile = new RandomAccessFile(file, "rw"); randomAccessFile = new RandomAccessFile(file, "rw");
long fileSize = getFileSize(); long fileSize = getFileSize(capacity);
if (!exists) { if (!exists) {
log.info("Creating new SPV block chain file " + file); log.info("Creating new SPV block chain file " + file);
randomAccessFile.setLength(fileSize); randomAccessFile.setLength(fileSize);
@ -166,7 +166,7 @@ public class SPVBlockStore implements BlockStore {
} }
/** Returns the size in bytes of the file that is used to store the chain with the current parameters. */ /** Returns the size in bytes of the file that is used to store the chain with the current parameters. */
public final int getFileSize() { public static final int getFileSize(int capacity) {
return RECORD_SIZE * capacity + FILE_PROLOGUE_BYTES /* extra kilobyte for stuff */; return RECORD_SIZE * capacity + FILE_PROLOGUE_BYTES /* extra kilobyte for stuff */;
} }
@ -178,7 +178,7 @@ public class SPVBlockStore implements BlockStore {
lock.lock(); lock.lock();
try { try {
int cursor = getRingCursor(buffer); int cursor = getRingCursor(buffer);
if (cursor == getFileSize()) { if (cursor == getFileSize(capacity)) {
// Wrapped around. // Wrapped around.
cursor = FILE_PROLOGUE_BYTES; cursor = FILE_PROLOGUE_BYTES;
} }
@ -210,7 +210,7 @@ public class SPVBlockStore implements BlockStore {
// wrapped around. // wrapped around.
int cursor = getRingCursor(buffer); int cursor = getRingCursor(buffer);
final int startingPoint = cursor; final int startingPoint = cursor;
final int fileSize = getFileSize(); final int fileSize = getFileSize(capacity);
final byte[] targetHashBytes = hash.getBytes(); final byte[] targetHashBytes = hash.getBytes();
byte[] scratch = new byte[32]; byte[] scratch = new byte[32];
do { do {