Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 07:12:17 +00:00
Code Issues Projects Releases Wiki Activity

Implement the equals method on StoredBlock and use it.

Browse Source
This commit is contained in:
Mike Hearn 2011-03-24 17:37:40 +00:00
parent ebfd7e4147
commit 7f30e20170
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/google/bitcoin/core/BlockChain.java
View File

@ -145,7 +145,7 @@ public class BlockChain {
// Store it. // Store it.
blockStore.put(newStoredBlock); blockStore.put(newStoredBlock);
// TODO: Break the assumption of object equality here. // TODO: Break the assumption of object equality here.
if (storedPrev == chainHead) { if (storedPrev.equals(chainHead)) {
// This block connects to the best known block, it is a normal continuation of the system. // This block connects to the best known block, it is a normal continuation of the system.
chainHead = newStoredBlock; chainHead = newStoredBlock;
LOG("Received new block, chain is now " + chainHead.height + " blocks high"); LOG("Received new block, chain is now " + chainHead.height + " blocks high");

7
src/com/google/bitcoin/core/StoredBlock.java
View File

@ -56,4 +56,11 @@ class StoredBlock {
boolean moreWorkThan(StoredBlock other) { boolean moreWorkThan(StoredBlock other) {
return chainWork.compareTo(other.chainWork) > 0; return chainWork.compareTo(other.chainWork) > 0;
} }
@Override
public boolean equals(Object other) {
if (!(other instanceof StoredBlock)) return false;
StoredBlock o = (StoredBlock) other;
return o.header.equals(header) && o.chainWork.equals(chainWork) && o.height == height;
}
} }