3
0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 02:05:53 +00:00

Fix test, upgrade to protobuf 2.4.1, doc

This commit is contained in:
Miron Cuperman 2012-01-11 12:41:14 -08:00
parent 1a2ce7d982
commit 9f90ae2f0e
3 changed files with 10 additions and 2 deletions

8
README
View File

@ -2,6 +2,14 @@ To get started, ensure you have the latest JDK installed, and download Maven fro
http://maven.apache.org/
and install the protobuf compiler package version 2.4.x:
Debian/Ubuntu: apt-get install protobuf-compiler
Windows: http://code.google.com/p/protobuf/downloads/list
OSX: install from ports?
Then run "mvn clean package" to compile the software. You can also run "mvn site:site" to generate a website with
useful information like JavaDocs. The outputs are under the target/ directory.

View File

@ -324,7 +324,7 @@
<junit.version>4.8.2</junit.version>
<slf4j.version>1.6.2</slf4j.version>
<derby.version>10.8.2.2</derby.version>
<protobuf.version>2.2.0</protobuf.version>
<protobuf.version>2.4.1</protobuf.version>
<generated.sourceDirectory>gen</generated.sourceDirectory>
</properties>

View File

@ -200,7 +200,7 @@ public class Wallet implements Serializable {
// Pending and inactive can overlap, so merge them before counting
HashSet<Transaction> pendingInactive = new HashSet<Transaction>();
pendingInactive.addAll(pending.values());
pendingInactive.retainAll(inactive.values());
pendingInactive.addAll(inactive.values());
return getTransactions(true, true).size() ==
unspent.size() + spent.size() + pendingInactive.size() + dead.size();