Merge branch 'master' into chore/merge-master-develop

This commit is contained in:
Aaron Blankstein
2021-09-08 09:56:15 -05:00

View File

@@ -1340,7 +1340,7 @@ fn should_fix_2771() {
return;
}
let (conf, _) = neon_integration_test_conf();
let (conf, _miner_account) = neon_integration_test_conf();
let mut btcd_controller = BitcoinCoreController::new(conf.clone());
btcd_controller