mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove taks for laod trade fee tx (use verify task for it) (WIP)

Browse source
This commit is contained in:
Manfred Karrer 2017-03-25 12:06:50 -05:00
parent c860845c9a
commit 4103920a31
6 changed files with 5 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/io/bisq/core/trade/protocol/BuyerAsMakerProtocol.java
View file

@ -123,9 +123,8 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
taskRunner.addTasks(
MakerProcessPayDepositRequest.class,
MakerVerifyArbitrationSelection.class,
MakerVerifyTakerFeePayment.class,
MakerVerifyTakerAccount.class,
MakerLoadTakeOfferFeeTx.class,
MakerVerifyTakerFeePayment.class,
MakerCreateAndSignContract.class,
BuyerAsMakerCreatesAndSignsDepositTx.class,
MakerSetupDepositBalanceListener.class,
@ -149,8 +148,8 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
() -> handleTaskRunnerSuccess("handle DepositTxPublishedMessage"),
this::handleTaskRunnerFault);
taskRunner.addTasks(MakerProcessDepositTxPublishedMessage.class,
MakerVerifyTakerFeePayment.class,
MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class,
MakerPublishTradeStatistics.class);
taskRunner.run();
}
@ -180,8 +179,8 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
handleTaskRunnerFault(errorMessage);
});
taskRunner.addTasks(
MakerVerifyTakerFeePayment.class,
MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class,
BuyerAsMakerSignPayoutTx.class,
BuyerSendFiatTransferStartedMessage.class,
BuyerSetupListenerForPayoutTx.class

3
core/src/main/java/io/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
View file

@ -96,7 +96,8 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
taskRunner.addTasks(
TakerSelectArbitrator.class,
TakerLoadMakerFeeTx.class,
TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class,
TakerCreateTakerFeeTx.class,
TakerBroadcastTakerFeeTx.class,
BuyerAsTakerCreatesDepositTxInputs.class,

1
core/src/main/java/io/bisq/core/trade/protocol/SellerAsMakerProtocol.java
View file

@ -109,7 +109,6 @@ public class SellerAsMakerProtocol extends TradeProtocol implements SellerProtoc
MakerVerifyArbitrationSelection.class,
MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class,
MakerLoadTakeOfferFeeTx.class,
MakerCreateAndSignContract.class,
SellerAsMakerCreatesAndSignsDepositTx.class,
MakerSetupDepositBalanceListener.class,

1
core/src/main/java/io/bisq/core/trade/protocol/SellerAsTakerProtocol.java
View file

@ -101,7 +101,6 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class,
TakerSelectArbitrator.class,
TakerLoadMakerFeeTx.class,
TakerCreateTakerFeeTx.class,
TakerBroadcastTakerFeeTx.class,
SellerAsTakerCreatesDepositTxInputs.class,

45
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerLoadTakeOfferFeeTx.java
View file

@ -1,45 +0,0 @@
/*
* This file is part of bisq.
*
* bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.trade.protocol.tasks.maker;
import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class MakerLoadTakeOfferFeeTx extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public MakerLoadTakeOfferFeeTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}
@Override
protected void run() {
try {
runInterceptHook();
// TODO impl. missing
//processModel.getWalletService().findTxInBlockChain(processModel.getTakeOfferFeeTxId());
complete();
} catch (Throwable t) {
failed(t);
}
}
}

46
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerLoadMakerFeeTx.java
View file

@ -1,46 +0,0 @@
/*
* This file is part of bisq.
*
* bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.trade.protocol.tasks.taker;
import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class TakerLoadMakerFeeTx extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public TakerLoadMakerFeeTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}
@Override
protected void run() {
try {
runInterceptHook();
// TODO impl. missing
///processModel.getWalletService().findTxInBlockChain(trade.getOfferPayload().getOfferFeePaymentTxId());
complete();
} catch (Throwable t) {
failed(t);
}
}
}