[r2r] UTXO swap watcher further improvements

[caglaryucekaya]

Further improvements, validations, bugfixes and test cases for the UTXO swap watchers

[sergeyboyko0791]

Thank you for the fixes! I have only one note :)

[artemii235]

One last note.

[artemii235]

In #1552 (comment) it was requested to create watcher_conf object and move all these fields there 🙂 Then, we can use SwapWatcherConf struct that will have #[serde(default = "fn_name")] for the missing fields case (I would also rename some fields to make them shorter a bit):

fn one_and_half() -> f64 { 1.5 }

fn three_hundred() -> f64 { 300. }

fn sixty() -> f64 { 60. }

#[derive(Deserialize)]
struct SwapWatcherConf {
    #[serde(default = "one_and_half")]
    wait_for_maker_payment_spend_factor: f64,
    #[serde(default = "one_and_half")]
    refund_start_time_factor: f64,
    #[serde(default = "three_hundred")]
    search_interval: f64,
    #[serde(default = "sixty")]
    wait_for_taker_payment_duration: f64,
}

[shamardy]

Only one question :)

[laruh]

Great progress!
Just have one question.

[caglaryucekaya]

Before this is merged, there's one more point I want to ask. In this PR I added a new parameter to the wait_for_htlc_tx_spend method, check_every, to reduce the frequency of output spend checks for watchers. Normally it was once in ten seconds everywhere, except for ethereum in which it was once in five seconds:

https://github.com/KomodoPlatform/atomicDEX-API/blob/a6046fd79af444b7a1f83eb7d388bd8f8c85bcb8/mm2src/coins/eth.rs#L1497-L1506

Now I made it all once in ten seconds with a constant:

https://github.com/KomodoPlatform/atomicDEX-API/blob/dec9c70563aaa84cae8ce8d119643ed6fe0b8067/mm2src/mm2_main/src/lp_swap/taker_swap.rs#L41

Is this important?

[shamardy]

LGTM!

[artemii235]

Normally it was once in ten seconds everywhere, except for ethereum in which it was once in five seconds:
Is this important?

@caglaryucekaya That's ok 🙂

[artemii235]

One more note 🙂

[artemii235]

With derived Default, we get the following:

    let conf = WatcherConf::default();
    println!("{:?}", conf);

WatcherConf { wait_taker_payment: 0.0, wait_maker_payment_spend_factor: 0.0, refund_start_factor: 0.0, search_interval: 0.0 }

I suppose it's not what we expect to get here:
https://github.com/KomodoPlatform/atomicDEX-API/blob/dec9c70563aaa84cae8ce8d119643ed6fe0b8067/mm2src/mm2_main/src/lp_swap/swap_watcher.rs#L580

Could you please implement Default manually instead, using appropriate values?

[sergeyboyko0791]

I believe this is resolved

[sergeyboyko0791]

Re-approve