Fix tests

Author: buffrr

client/src/format.rs

@@ -152,9 +152,10 @@ pub fn print_list_unspent(utxos: Vec<WalletOutput>, format: Format) {
 pub fn print_server_info(info: ServerInfo, format: Format) {
     match format {
         Format::Text => {
-            println!("CHAIN: {}", info.network);
-            println!("  Height {}", info.tip.height);
-            println!("  Hash {}", info.tip.hash);
+            println!("Network: {}", info.network);
+            println!("Height {}", info.tip.height);
+            println!("Hash {}", info.tip.hash);
+            println!("Progress {:.2}%", info.progress * 100.0);
         }
         Format::Json => {
             println!("{}", serde_json::to_string_pretty(&info).unwrap());

client/src/rpc.rs

@@ -1591,7 +1591,7 @@ async fn get_server_info(client: &reqwest::Client, rpc: &BitcoinRpc, tip: ChainA
             blocks: info.blocks,
             headers: info.headers,
         },
-        progress: if info.headers >= tip.height {
+        progress: if info.headers != 0 && info.headers >= tip.height {
             tip.height as f32 / info.headers as f32
         } else {
             0.0

client/tests/fetcher_tests.rs

@@ -8,6 +8,7 @@ use spaces_client::source::{
     BitcoinBlockSource, BitcoinRpc, BitcoinRpcAuth, BlockEvent, BlockFetcher,
 };
 use spaces_protocol::{bitcoin::BlockHash, constants::ChainAnchor};
+use spaces_protocol::bitcoin::Network;
 use spaces_testutil::TestRig;
 
 async fn setup(blocks: u64) -> Result<(TestRig, u64, BlockHash)> {
@@ -27,8 +28,9 @@ fn test_block_fetching_from_bitcoin_rpc() -> Result<()> {
     let fetcher_rpc = BitcoinBlockSource::new(BitcoinRpc::new(
         &rig.bitcoind.rpc_url(),
         BitcoinRpcAuth::UserPass("user".to_string(), "password".to_string()),
+        true
     ));
-    let (fetcher, receiver) = BlockFetcher::new(fetcher_rpc.clone(), 8);
+    let (fetcher, receiver) = BlockFetcher::new(Network::Regtest, fetcher_rpc.clone(), 8);
     fetcher.start(ChainAnchor { hash, height: 0 });
 
     let timeout = Duration::from_secs(5);