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

api/src/foreign.rs

@@ -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);
 

api/src/owner.rs

@@ -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);