frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ci] Rename MAGICAL_ env vars to BDK_, for tests use wallet name in RPC calls

Browse Source
This commit is contained in:
Steve Myers 2021-02-12 09:53:37 -08:00
parent eeff3b5049
commit 4ad0f54c30
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/cont_integration.yml vendored
View File

@ -76,13 +76,14 @@ jobs:
test-electrum: test-electrum:
name: Test electrum name: Test electrum
runs-on: ubuntu-16.04 runs-on: ubuntu-16.04
container: bitcoindevkit/electrs container: bitcoindevkit/electrs:0.2.0
env: env:
MAGICAL_RPC_AUTH: USER_PASS BDK_RPC_AUTH: USER_PASS
MAGICAL_RPC_USER: admin BDK_RPC_USER: admin
MAGICAL_RPC_PASS: passw BDK_RPC_PASS: passw
MAGICAL_RPC_URL: 127.0.0.1:18443 BDK_RPC_URL: 127.0.0.1:18443
MAGICAL_ELECTRUM_URL: tcp://127.0.0.1:60401 BDK_RPC_WALLET: bdk-test
BDK_ELECTRUM_URL: tcp://127.0.0.1:60401
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

4
Cargo.toml
View File

@ -59,8 +59,8 @@ test-electrum = ["electrum"]
test-md-docs = ["electrum"] test-md-docs = ["electrum"]
[dev-dependencies] [dev-dependencies]
bdk-testutils = "^0.3" bdk-testutils = { path = "./testutils"}
bdk-testutils-macros = "^0.3" bdk-testutils-macros = { path = "./testutils-macros"}
serial_test = "0.4" serial_test = "0.4"
lazy_static = "1.4" lazy_static = "1.4"
env_logger = "0.7" env_logger = "0.7"

10
ci/start-core.sh
View File

@ -1,16 +1,16 @@
#!/usr/bin/env sh #!/usr/bin/env sh
echo "Starting bitcoin node." echo "Starting bitcoin node."
/root/bitcoind -regtest -server -daemon -fallbackfee=0.0002 -rpcuser=admin -rpcpassword=passw -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0 -blockfilterindex=1 -peerblockfilters=1 /root/bitcoind -regtest -server -daemon -fallbackfee=0.0002 -rpcuser=$BDK_RPC_USER -rpcpassword=$BDK_RPC_PASS -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0 -blockfilterindex=1 -peerblockfilters=1
echo "Waiting for bitcoin node." echo "Waiting for bitcoin node."
until /root/bitcoin-cli -regtest -rpcuser=admin -rpcpassword=passw getblockchaininfo; do until /root/bitcoin-cli -regtest -rpcuser=$BDK_RPC_USER -rpcpassword=$BDK_RPC_PASS getblockchaininfo; do
sleep 1 sleep 1
done done
/root/bitcoind -regtest -rpcuser=admin -rpcpassword=passw createwallet bdk-test /root/bitcoin-cli -regtest -rpcuser=$BDK_RPC_USER -rpcpassword=$BDK_RPC_PASS createwallet $BDK_RPC_WALLET
echo "Generating 150 bitcoin blocks." echo "Generating 150 bitcoin blocks."
ADDR=$(/root/bitcoin-cli -regtest -rpcuser=admin -rpcpassword=passw getnewaddress) ADDR=$(/root/bitcoin-cli -regtest -rpcuser=$BDK_RPC_USER -rpcpassword=$BDK_RPC_PASS -rpcwallet=$BDK_RPC_WALLET getnewaddress)
/root/bitcoin-cli -regtest -rpcuser=admin -rpcpassword=passw generatetoaddress 150 $ADDR /root/bitcoin-cli -regtest -rpcuser=$BDK_RPC_USER -rpcpassword=$BDK_RPC_PASS generatetoaddress 150 $ADDR
echo "Starting electrs node." echo "Starting electrs node."
nohup /root/electrs --network regtest --jsonrpc-import & nohup /root/electrs --network regtest --jsonrpc-import &

16
testutils/src/lib.rs
View File

@ -53,20 +53,20 @@ pub use electrum_client::{Client as ElectrumClient, ElectrumApi};
// TODO: we currently only support env vars, we could also parse a toml file // TODO: we currently only support env vars, we could also parse a toml file
fn get_auth() -> Auth { fn get_auth() -> Auth {
match env::var("MAGICAL_RPC_AUTH").as_ref().map(String::as_ref) { match env::var("BDK_RPC_AUTH").as_ref().map(String::as_ref) {
Ok("USER_PASS") => Auth::UserPass( Ok("USER_PASS") => Auth::UserPass(
env::var("MAGICAL_RPC_USER").unwrap(), env::var("BDK_RPC_USER").unwrap(),
env::var("MAGICAL_RPC_PASS").unwrap(), env::var("BDK_RPC_PASS").unwrap(),
), ),
_ => Auth::CookieFile(PathBuf::from( _ => Auth::CookieFile(PathBuf::from(
env::var("MAGICAL_RPC_COOKIEFILE") env::var("BDK_RPC_COOKIEFILE")
.unwrap_or("/home/user/.bitcoin/regtest/.cookie".to_string()), .unwrap_or("/home/user/.bitcoin/regtest/.cookie".to_string()),
)), )),
} }
} }
pub fn get_electrum_url() -> String { pub fn get_electrum_url() -> String {
env::var("MAGICAL_ELECTRUM_URL").unwrap_or("tcp://127.0.0.1:50001".to_string()) env::var("BDK_ELECTRUM_URL").unwrap_or("tcp://127.0.0.1:50001".to_string())
} }
pub struct TestClient { pub struct TestClient {
@ -311,8 +311,10 @@ where
impl TestClient { impl TestClient {
pub fn new() -> Self { pub fn new() -> Self {
let url = env::var("MAGICAL_RPC_URL").unwrap_or("127.0.0.1:18443".to_string()); let url = env::var("BDK_RPC_URL").unwrap_or("127.0.0.1:18443".to_string());
let client = RpcClient::new(format!("http://{}", url), get_auth()).unwrap(); let wallet = env::var("BDK_RPC_WALLET").unwrap_or("bdk-test".to_string());
let client =
RpcClient::new(format!("http://{}/wallet/{}", url, wallet), get_auth()).unwrap();
let electrum = ElectrumClient::new(&get_electrum_url()).unwrap(); let electrum = ElectrumClient::new(&get_electrum_url()).unwrap();
TestClient { client, electrum } TestClient { client, electrum }