Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-20 19:11:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into local_chain_type

Browse source
This commit is contained in:
antiochp 2020-05-23 11:03:37 +01:00
commit e368c4cb46
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/src/foreign.rs
View file

@ -427,6 +427,11 @@ macro_rules! doctest_helper_setup_doc_env_foreign {
use impls::{DefaultLCProvider, DefaultWalletImpl, HTTPNodeClient};
use libwallet::{BlockFees, IssueInvoiceTxArgs, Slate, WalletInst};
// don't run on windows CI, which gives very inconsistent results
if cfg!(windows) {
return;
}
// Set our local chain_type for testing.
global::set_local_chain_type(global::ChainTypes::AutomatedTesting);

5
api/src/owner.rs
View file

@ -2132,6 +2132,11 @@ macro_rules! doctest_helper_setup_doc_env {
use uuid::Uuid;
// don't run on windows CI, which gives very inconsistent results
if cfg!(windows) {
return;
}
// Set our local chain_type for testing.
global::set_local_chain_type(global::ChainTypes::AutomatedTesting);