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

Always pass the wallet into the event listeners on every event.

Browse Source
This commit is contained in:
Mike Hearn 2011-09-18 20:14:14 +00:00
parent bbe133be88
commit a3a4a927af
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/google/bitcoin/core/AbstractWalletEventListener.java
View File

@ -51,7 +51,7 @@ public abstract class AbstractWalletEventListener implements WalletEventListener
* *
* TODO: Finish this interface. * TODO: Finish this interface.
*/ */
public void onReorganize() { public void onReorganize(Wallet wallet) {
onChange(); onChange();
} }
@ -68,7 +68,7 @@ public abstract class AbstractWalletEventListener implements WalletEventListener
* @param deadTx The transaction that is newly dead. * @param deadTx The transaction that is newly dead.
* @param replacementTx The transaction that killed it. * @param replacementTx The transaction that killed it.
*/ */
public void onDeadTransaction(Transaction deadTx, Transaction replacementTx) { public void onDeadTransaction(Wallet wallet, Transaction deadTx, Transaction replacementTx) {
onChange(); onChange();
} }

10
src/com/google/bitcoin/core/Wallet.java
View File

@ -294,8 +294,8 @@ public class Wallet implements Serializable {
log.info("Balance is now: " + bitcoinValueToFriendlyString(getBalance())); log.info("Balance is now: " + bitcoinValueToFriendlyString(getBalance()));
// Inform anyone interested that we have new coins. Note: we may be re-entered by the event listener, // Inform anyone interested that we have new coins. Note: we may be re-entered by the event listener,
// so we must not make assumptions about our state after this loop returns! For example, // so we must not make assumptions about our state after this loop returns! For example the balance we just
// the balance we just received might already be spent! // received might already be spent!
if (!reorg && bestChain && valueDifference.compareTo(BigInteger.ZERO) > 0) { if (!reorg && bestChain && valueDifference.compareTo(BigInteger.ZERO) > 0) {
for (WalletEventListener l : eventListeners) { for (WalletEventListener l : eventListeners) {
synchronized (l) { synchronized (l) {
@ -370,7 +370,7 @@ public class Wallet implements Serializable {
// Inform the event listeners of the newly dead tx. // Inform the event listeners of the newly dead tx.
for (WalletEventListener listener : eventListeners) { for (WalletEventListener listener : eventListeners) {
synchronized (listener) { synchronized (listener) {
listener.onDeadTransaction(connected, tx); listener.onDeadTransaction(this, connected, tx);
} }
} }
} }
@ -928,7 +928,7 @@ public class Wallet implements Serializable {
// Synchronize on the event listener as well. This allows a single listener to handle events from // Synchronize on the event listener as well. This allows a single listener to handle events from
// multiple wallets without needing to worry about being thread safe. // multiple wallets without needing to worry about being thread safe.
synchronized (l) { synchronized (l) {
l.onReorganize(); l.onReorganize(this);
} }
} }
} }
@ -962,7 +962,7 @@ public class Wallet implements Serializable {
// Inform the event listeners of the newly dead tx. // Inform the event listeners of the newly dead tx.
for (WalletEventListener listener : eventListeners) { for (WalletEventListener listener : eventListeners) {
synchronized (listener) { synchronized (listener) {
listener.onDeadTransaction(tx, replacement); listener.onDeadTransaction(this, tx, replacement);
} }
} }
break; break;

4
src/com/google/bitcoin/core/WalletEventListener.java
View File

@ -50,7 +50,7 @@ public interface WalletEventListener {
* *
* TODO: Finish this interface. * TODO: Finish this interface.
*/ */
void onReorganize(); void onReorganize(Wallet wallet);
/** /**
* This is called on a Peer thread when a transaction becomes <i>dead</i>. A dead transaction is one that has * This is called on a Peer thread when a transaction becomes <i>dead</i>. A dead transaction is one that has
@ -64,5 +64,5 @@ public interface WalletEventListener {
* @param deadTx The transaction that is newly dead. * @param deadTx The transaction that is newly dead.
* @param replacementTx The transaction that killed it. * @param replacementTx The transaction that killed it.
*/ */
void onDeadTransaction(Transaction deadTx, Transaction replacementTx); void onDeadTransaction(Wallet wallet, Transaction deadTx, Transaction replacementTx);
} }

6
tests/com/google/bitcoin/core/ChainSplitTests.java
View File

@ -53,7 +53,7 @@ public class ChainSplitTests {
reorgHappened[0] = false; reorgHappened[0] = false;
wallet.addEventListener(new AbstractWalletEventListener() { wallet.addEventListener(new AbstractWalletEventListener() {
@Override @Override
public void onReorganize() { public void onReorganize(Wallet wallet) {
reorgHappened[0] = true; reorgHappened[0] = true;
} }
}); });
@ -187,7 +187,7 @@ public class ChainSplitTests {
final boolean[] eventCalled = new boolean[1]; final boolean[] eventCalled = new boolean[1];
wallet.addEventListener(new AbstractWalletEventListener() { wallet.addEventListener(new AbstractWalletEventListener() {
@Override @Override
public void onDeadTransaction(Transaction deadTx, Transaction replacementTx) { public void onDeadTransaction(Wallet wallet, Transaction deadTx, Transaction replacementTx) {
eventCalled[0] = true; eventCalled[0] = true;
} }
}); });
@ -227,7 +227,7 @@ public class ChainSplitTests {
final Transaction[] eventReplacement = new Transaction[1]; final Transaction[] eventReplacement = new Transaction[1];
wallet.addEventListener(new AbstractWalletEventListener() { wallet.addEventListener(new AbstractWalletEventListener() {
@Override @Override
public void onDeadTransaction(Transaction deadTx, Transaction replacementTx) { public void onDeadTransaction(Wallet wallet, Transaction deadTx, Transaction replacementTx) {
eventDead[0] = deadTx; eventDead[0] = deadTx;
eventReplacement[0] = replacementTx; eventReplacement[0] = replacementTx;
} }

2
tests/com/google/bitcoin/core/WalletTest.java
View File

@ -251,7 +251,7 @@ public class WalletTest {
final Transaction[] eventReplacement = new Transaction[1]; final Transaction[] eventReplacement = new Transaction[1];
wallet.addEventListener(new AbstractWalletEventListener() { wallet.addEventListener(new AbstractWalletEventListener() {
@Override @Override
public void onDeadTransaction(Transaction deadTx, Transaction replacementTx) { public void onDeadTransaction(Wallet wallet, Transaction deadTx, Transaction replacementTx) {
eventDead[0] = deadTx; eventDead[0] = deadTx;
eventReplacement[0] = replacementTx; eventReplacement[0] = replacementTx;
} }