From e2a9a3701cfaf16dc9e7181646c3827b10955b32 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 15 Jan 2016 01:40:56 +0100 Subject: [PATCH] Use tx id instead of tx as param --- .../src/main/java/io/bitsquare/btc/TradeWalletService.java | 7 +++---- core/src/main/java/io/bitsquare/trade/Trade.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java index e3963c6fce..0609652ccc 100644 --- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java +++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java @@ -848,13 +848,12 @@ public class TradeWalletService { } /** - * @param tx The transaction we want to lookup + * @param txId The transaction ID of the transaction we want to lookup * @return Returns local existing wallet transaction * @throws VerificationException */ - public Transaction getWalletTx(Transaction tx) throws VerificationException { - // log.trace("getWalleTx tx " + tx.toString()); - return wallet.getTransaction(tx.getHash()); + public Transaction getWalletTx(Sha256Hash txId) throws VerificationException { + return wallet.getTransaction(txId); } /** diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java index 31c82ac14d..7ae9bceaf7 100644 --- a/core/src/main/java/io/bitsquare/trade/Trade.java +++ b/core/src/main/java/io/bitsquare/trade/Trade.java @@ -264,7 +264,7 @@ abstract public class Trade implements Tradable, Model, Serializable { // The deserialized tx has not actual confidence data, so we need to get the fresh one from the wallet. public void updateDepositTxFromWallet(TradeWalletService tradeWalletService) { if (depositTx != null) - setDepositTx(tradeWalletService.getWalletTx(depositTx)); + setDepositTx(tradeWalletService.getWalletTx(depositTx.getHash())); } public void setDepositTx(Transaction tx) {