Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use max(10 x dust, 0.00777) as min_volume + minor API additions. #858

Merged
merged 12 commits into from
Mar 15, 2021
Merged

Use max(10 x dust, 0.00777) as min_volume + minor API additions. #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8cef5a
WIP.
artemii235 Mar 8, 2021
135e168
WIP. Refactor.
artemii235 Mar 9, 2021
685e2f0
WIP.
artemii235 Mar 11, 2021
eeff99d
Merge remote-tracking branch 'origin/mm2.1' into mm2.1-min-vol-dust
artemii235 Mar 11, 2021
53e697c
WIP. Refactoring.
artemii235 Mar 11, 2021
f448d14
Merge remote-tracking branch 'origin/mm2.1' into mm2.1-min-vol-dust
artemii235 Mar 12, 2021
31de9fa
WIP. Add maker_order_timeout to MM2 json conf.
artemii235 Mar 12, 2021
d85bbfb
WIP. Add my_order_uuid to my_swap_status.
artemii235 Mar 12, 2021
e345eea
Fix tests.
artemii235 Mar 12, 2021
54867e4
WIP. Tests fail.
artemii235 Mar 12, 2021
9b10179
Calculate min_volume using min_tx_amount on setprice.
artemii235 Mar 12, 2021
cc9ab86
Replace match with unwrap_or_else.
artemii235 Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mm2src/coins/test_coin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct TestCoin {}
#[mockable]
#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
impl MarketCoinOps for TestCoin {
fn ticker(&self) -> &str { unimplemented!() }
fn ticker(&self) -> &str { "test" }

fn my_address(&self) -> Result<String, String> { unimplemented!() }

Expand Down
5 changes: 3 additions & 2 deletions mm2src/docker_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,12 +2496,13 @@ mod docker_tests {
"rel": "MYCOIN1",
"price": 1,
"volume": 1,
"timeout": 2,
})))
.unwrap();
assert!(rc.0.is_success(), "!sell: {}", rc.1);

log!("Give Bob 35 seconds to convert order to maker");
thread::sleep(Duration::from_secs(35));
log!("Give Bob 4 seconds to convert order to maker");
thread::sleep(Duration::from_secs(4));

let rc = block_on(mm_alice.rpc(json! ({
"userpass": mm_alice.userpass,
Expand Down
Loading