[ft.] lightmode block fetch and decode.

[Enh.] Deser. Block Hex Data

[Fix.] Iter support

[Fmt.] Cargo format.

Linter Fix

[Clairty] removed unneeded comment

txids -> txid_vec

Author: portlandhodl

src/new_index/schema.rs

@@ -518,20 +518,20 @@ impl ChainQuery {
     pub fn get_block_txs(&self, hash: &BlockHash) -> Option<Vec<Transaction>> {
         let _timer = self.start_timer("get_block_txs");
 
-        let txids: Option<Vec<Txid>> = if self.light_mode {
-            // TODO fetch block as binary from REST API instead of as hex
-            let mut blockinfo = self.daemon.getblock_raw(hash, 1).ok()?;
-            Some(serde_json::from_value(blockinfo["tx"].take()).unwrap())
+        if self.light_mode {
+            hex::decode(self.daemon.getblock_raw(hash, 0).ok()?.as_str()?)
+                .ok()
+                .and_then(|block_bytes| deserialize::<crate::chain::Block>(&block_bytes).ok())
+                .map(|block| block.txdata)
         } else {
-            self.store
+            let txid_vec: Vec<Txid> = self
+                .store
                 .txstore_db
                 .get(&BlockRow::txids_key(full_hash(&hash[..])))
                 .map(|val| {
                     bincode_util::deserialize_little(&val).expect("failed to parse block txids")
-                })
-        };
+                })?;
 
-        txids.and_then(|txid_vec| {
             let mut transactions = Vec::with_capacity(txid_vec.len());
 
             for txid in txid_vec {
@@ -542,7 +542,7 @@ impl ChainQuery {
             }
 
             Some(transactions)
-        })
+        }
     }
 
     pub fn get_block_meta(&self, hash: &BlockHash) -> Option<BlockMeta> {

src/rest.rs

@@ -783,10 +783,20 @@ fn handle_request(
         (&Method::GET, Some(&INTERNAL_PREFIX), Some(&"block"), Some(hash), Some(&"txs"), None) => {
             let hash = BlockHash::from_hex(hash)?;
             let block_id = query.chain().blockid_by_hash(&hash);
+
+            let block_id =
+                Some(block_id.ok_or_else(|| {
+                    HttpError::not_found("Block with hash not found".to_string())
+                })?);
+
             let txs = query
                 .chain()
                 .get_block_txs(&hash)
-                .ok_or_else(|| HttpError::not_found("Block not found".to_string()))?
+                .ok_or_else(|| {
+                    HttpError::not_found(
+                        "Transactions could not be queried from block.".to_string(),
+                    )
+                })?
                 .into_iter()
                 .map(|tx| (tx, block_id.clone()))
                 .collect();