Merge branch 'master' into main

Author: txalkan

README.md

@@ -293,7 +293,7 @@ biscuit keypair
 # alternatively, you can export just the private key
 biscuit keypair --only-private-key > private-key-file
 # and later derive the public key from it
-biscuit keypair --from-private-key-file private-key-file --only-public-key
+biscuit keypair --from-file private-key-file --only-public-key
 ```
 
 Save the private key in a secure way (e.g. in a secret manager).

src/test/mod.rs

@@ -1280,8 +1280,8 @@ async fn open_channel_raw(
                 && c.asset_id == asset_id.map(|id| id.to_string())
                 && c.asset_local_amount == asset_amount
         }) {
-            if let Some(funding_txid) = &channel.funding_txid {
-                let txout = _get_txout(funding_txid);
+            if let Some(txid) = &channel.funding_txid {
+                let txout = _get_txout(txid);
                 if !txout.is_empty() {
                     mine_n_blocks(false, 6);
                     channel_id = Some(channel.channel_id.clone());