Change order of tasks

Call BuyerSetupPayoutTxListener before BuyerSendCounterCurrencyTransferStartedMessage
We will change BuyerSendCounterCurrencyTransferStartedMessage so that it
does not complete until the message has been ACKed by the peer.
It is more transparent to leave the task uncompleted and if it is the last task we dont have issues.
The caller would not get the result handler called though until all is completed. But the result handler in the UI was anyway empty.
This commit is contained in:
chimp1984 2020-09-22 19:01:51 -05:00
parent b13e1a3edb
commit 96221317e2
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
2 changed files with 4 additions and 5 deletions

View File

@ -234,8 +234,8 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class,
BuyerSignPayoutTx.class,
BuyerSendCounterCurrencyTransferStartedMessage.class,
BuyerSetupPayoutTxListener.class
BuyerSetupPayoutTxListener.class,
BuyerSendCounterCurrencyTransferStartedMessage.class
);
taskRunner.run();
} else {

View File

@ -198,7 +198,6 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
taskRunner.run();
}
// The DepositTxAndDelayedPayoutTxMessage is a mailbox message as earlier we use only the deposit tx which can
// be also received from the network once published.
// Now we send the delayed payout tx as well and with that this message is mandatory for continuing the protocol.
@ -263,8 +262,8 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class,
BuyerSignPayoutTx.class,
BuyerSendCounterCurrencyTransferStartedMessage.class,
BuyerSetupPayoutTxListener.class
BuyerSetupPayoutTxListener.class,
BuyerSendCounterCurrencyTransferStartedMessage.class
);
taskRunner.run();
} else {