Adapt to bitcoinj API changes.

vinumeris · Dec 4, 2014 · 940889d · 940889d
1 parent c6d32dc
commit 940889d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/client/src/main/java/lighthouse/subwindows/RevokeAndClaimWindow.java b/client/src/main/java/lighthouse/subwindows/RevokeAndClaimWindow.java
@@ -169,8 +169,8 @@ private void claim(@Nullable KeyParameter key) {
     private void revoke(@Nullable KeyParameter aesKey) {
         try {
             PledgingWallet.Revocation revocation = Main.wallet.revokePledge(pledgeToRevoke, aesKey);
-            revocation.tx.getConfidence().addEventListener((tx, reason) -> {
-                progressBar.setProgress(tx.getConfidence().numBroadcastPeers() / (double) Main.bitcoin.peerGroup().getMinBroadcastConnections());
+            revocation.tx.getConfidence().addEventListener((conf, reason) -> {
+                progressBar.setProgress(conf.numBroadcastPeers() / (double) Main.bitcoin.peerGroup().getMinBroadcastConnections());
             }, Platform::runLater);
             Futures.addCallback(revocation.broadcastFuture, new FutureCallback<Transaction>() {
                 @Override

diff --git a/common/src/main/java/lighthouse/LighthouseBackend.java b/common/src/main/java/lighthouse/LighthouseBackend.java
@@ -211,8 +211,8 @@ private void addClaimConfidenceListener(AffinityExecutor executor, Transaction t
             private boolean done = false;
 
             @Override
-            public void onConfidenceChanged(Transaction t, ChangeReason changeReason) {
-                if (!done && checkClaimConfidence(t, project)) {
+            public void onConfidenceChanged(TransactionConfidence conf, ChangeReason changeReason) {
+                if (!done && checkClaimConfidence(transaction, conf, project)) {
                     // Because an async thread is queuing up events on our thread, we can still get run even after
                     // the event listener has been removed. So just quiet things a bit here.
                     done = true;
@@ -240,30 +240,30 @@ private void checkPossibleClaimTX(Transaction tx) {
         tx.setPurpose(Transaction.Purpose.ASSURANCE_CONTRACT_CLAIM);
         // Figure out if the claim is good enough to tell the user about yet. Note that our confidence can go DOWN
         // as well as up if the transaction is double spent or there's a re-org that sends it back to being pending.
-        checkClaimConfidence(tx, project);
+        checkClaimConfidence(tx, tx.getConfidence(),  project);
         addClaimConfidenceListener(executor, tx, project);
     }
 
-    private boolean checkClaimConfidence(Transaction t, Project project) {
-        switch (t.getConfidence().getConfidenceType()) {
+    private boolean checkClaimConfidence(Transaction transaction, TransactionConfidence conf, Project project) {
+        switch (conf.getConfidenceType()) {
             case PENDING:
-                int seenBy = t.getConfidence().numBroadcastPeers();
+                int seenBy = conf.numBroadcastPeers();
                 log.info("Claim seen by {} peers", seenBy);
                 if (seenBy < peerGroup.getMinBroadcastConnections() || wallet.getParams().equals(RegTestParams.get()))
                     break;
                 // Fall through ...
             case BUILDING:
-                if (t.getConfidence().getDepthInBlocks() > 3)
+                if (conf.getDepthInBlocks() > 3)
                     return true;  // Don't care about watching this anymore.
                 log.info("Claim propagated or mined");
                 if (project.getPaymentURL() == null || mode == Mode.SERVER)
-                    movePledgesFromOpenToClaimed(t, project);
+                    movePledgesFromOpenToClaimed(transaction, project);
                 else
                     refreshProjectStatusFromServer(project);
-                diskManager.setProjectState(project, new ProjectStateInfo(ProjectState.CLAIMED, t.getHash()));
+                diskManager.setProjectState(project, new ProjectStateInfo(ProjectState.CLAIMED, transaction.getHash()));
                 break;
             case DEAD:
-                log.warn("Claim double spent! Overridden by {}", t.getConfidence().getOverridingTransaction());
+                log.warn("Claim double spent! Overridden by {}", conf.getOverridingTransaction());
                 diskManager.setProjectState(project, new ProjectStateInfo(ProjectState.ERROR, null));
                 break;
             case UNKNOWN:

diff --git a/common/src/main/java/lighthouse/wallet/PledgingWallet.java b/common/src/main/java/lighthouse/wallet/PledgingWallet.java
@@ -477,10 +477,10 @@ public CompletionProgress completeContractWithFee(Project project, Set<LHProtos.
             private Set<PeerAddress> addrs = new HashSet<>();
 
             @Override
-            public void onConfidenceChanged(Transaction tx, ChangeReason reason) {
+            public void onConfidenceChanged(TransactionConfidence conf, ChangeReason reason) {
                 // tx can be different.
                 if (reason == TransactionConfidence.Listener.ChangeReason.SEEN_PEERS) {
-                    addrs.addAll(Sets.newHashSet(tx.getConfidence().getBroadcastBy()));
+                    addrs.addAll(Sets.newHashSet(conf.getBroadcastBy()));
                     progress.setPeersSeen(addrs.size());
                 } else if (reason == ChangeReason.TYPE) {
                     progress.setPeersSeen(-1);