refactor: rename _hash -> _addr (#168)

supiket · web-flow · commit daf062fa5fd3 · 2024-12-06T11:18:52.000+11:00
diff --git a/crates/node-db-sql/sql/create/solution_set.sql b/crates/node-db-sql/sql/create/solution_set.sql
@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS solution_set (
     id INTEGER PRIMARY KEY,
-    content_hash BLOB NOT NULL UNIQUE
+    content_addr BLOB NOT NULL UNIQUE
 );
diff --git a/crates/node-db-sql/sql/insert/block_solution_set.sql b/crates/node-db-sql/sql/insert/block_solution_set.sql
@@ -3,6 +3,6 @@ INSERT OR IGNORE INTO
 VALUES
     (
         (SELECT id FROM block WHERE block.block_address = :block_address LIMIT 1),
-        (SELECT id FROM solution_set WHERE solution_set.content_hash = :solution_set_hash LIMIT 1),
+        (SELECT id FROM solution_set WHERE solution_set.content_addr = :solution_set_addr LIMIT 1),
         :solution_set_index
     );
diff --git a/crates/node-db-sql/sql/insert/failed_block.sql b/crates/node-db-sql/sql/insert/failed_block.sql
@@ -3,5 +3,5 @@ INSERT
 VALUES
     (
         (SELECT id FROM block WHERE block.block_address = :block_address LIMIT 1),
-        (SELECT id FROM solution_set WHERE solution_set.content_hash = :solution_set_hash LIMIT 1)
+        (SELECT id FROM solution_set WHERE solution_set.content_addr = :solution_set_addr LIMIT 1)
     );
diff --git a/crates/node-db-sql/sql/insert/mutation.sql b/crates/node-db-sql/sql/insert/mutation.sql
@@ -14,7 +14,7 @@ VALUES
                 solution
                 JOIN solution_set ON solution_set.id = solution.solution_set_id
             WHERE
-                solution_set.content_hash = :solution_set_hash AND solution.solution_index = :solution_index
+                solution_set.content_addr = :solution_set_addr AND solution.solution_index = :solution_index
             LIMIT
                 1
         ), :mutation_index, :key, :value
diff --git a/crates/node-db-sql/sql/insert/pred_data.sql b/crates/node-db-sql/sql/insert/pred_data.sql
@@ -13,7 +13,7 @@ VALUES
                 solution
                 JOIN solution_set ON solution_set.id = solution.solution_set_id
             WHERE
-                solution_set.content_hash = :solution_set_hash AND solution.solution_index = :solution_index
+                solution_set.content_addr = :solution_set_addr AND solution.solution_index = :solution_index
             LIMIT
                 1
         ), :pred_data_index, :value
diff --git a/crates/node-db-sql/sql/insert/solution.sql b/crates/node-db-sql/sql/insert/solution.sql
@@ -8,7 +8,7 @@ VALUES
             FROM
                 solution_set
             WHERE
-                content_hash = :solution_set_hash
+                content_addr = :solution_set_addr
             LIMIT
                 1
         ), :solution_index, :contract_addr, :predicate_addr
diff --git a/crates/node-db-sql/sql/insert/solution_set.sql b/crates/node-db-sql/sql/insert/solution_set.sql
@@ -1,4 +1,4 @@
 INSERT
-    OR IGNORE INTO solution_set (content_hash)
+    OR IGNORE INTO solution_set (content_addr)
 VALUES
-    (:content_hash)
+    (:content_addr)
diff --git a/crates/node-db-sql/sql/query/get_block.sql b/crates/node-db-sql/sql/query/get_block.sql
@@ -1,5 +1,5 @@
 SELECT
-    solution_set.content_hash
+    solution_set.content_addr
 FROM
     block
     LEFT JOIN block_solution_set ON block.id = block_solution_set.block_id
diff --git a/crates/node-db-sql/sql/query/get_solution.sql b/crates/node-db-sql/sql/query/get_solution.sql
@@ -5,6 +5,6 @@ FROM
     solution_set
     JOIN solution ON solution.solution_set_id = solution_set.id
 WHERE
-    solution_set.content_hash = ?
+    solution_set.content_addr = ?
 ORDER BY
     solution.solution_index ASC;
diff --git a/crates/node-db-sql/sql/query/get_solution_mutations.sql b/crates/node-db-sql/sql/query/get_solution_mutations.sql
@@ -6,6 +6,6 @@ FROM
     JOIN solution ON solution.solution_set_id = solution_set.id
     JOIN mutation ON mutation.solution_id = solution.id
 WHERE
-    solution_set.content_hash = :content_hash AND solution.solution_index = :solution_index;
+    solution_set.content_addr = :content_addr AND solution.solution_index = :solution_index;
 ORDER BY
     mutation.mutation_index ASC
diff --git a/crates/node-db-sql/sql/query/get_solution_pred_data.sql b/crates/node-db-sql/sql/query/get_solution_pred_data.sql
@@ -5,6 +5,6 @@ FROM
     JOIN solution ON solution.solution_set_id = solution_set.id
     JOIN pred_data ON pred_data.solution_id = solution.id
 WHERE
-    solution_set.content_hash = :content_hash AND solution.solution_index = :solution_index;
+    solution_set.content_addr = :content_addr AND solution.solution_index = :solution_index;
 ORDER BY
     pred_data.pred_data_index ASC
diff --git a/crates/node-db-sql/sql/query/list_blocks.sql b/crates/node-db-sql/sql/query/list_blocks.sql
@@ -3,7 +3,7 @@ SELECT
     block.number,
     block.timestamp_secs,
     block.timestamp_nanos,
-    solution_set.content_hash
+    solution_set.content_addr
 FROM
     block
     LEFT JOIN block_solution_set ON block.id = block_solution_set.block_id
diff --git a/crates/node-db-sql/sql/query/list_blocks_by_time.sql b/crates/node-db-sql/sql/query/list_blocks_by_time.sql
@@ -3,7 +3,7 @@ SELECT
     block.number,
     block.timestamp_secs,
     block.timestamp_nanos,
-    solution_set.content_hash
+    solution_set.content_addr
 
 FROM
     block
diff --git a/crates/node-db-sql/sql/query/list_failed_blocks.sql b/crates/node-db-sql/sql/query/list_failed_blocks.sql
@@ -1,6 +1,6 @@
 SELECT
     block.number,
-    solution_set.content_hash
+    solution_set.content_addr
 FROM
     failed_block
     JOIN block ON failed_block.block_id = block.id
@@ -10,4 +10,4 @@ WHERE
 ORDER BY
     block.number ASC,
     block.block_address ASC,
-    solution_set.content_hash ASC;
+    solution_set.content_addr ASC;
diff --git a/crates/node-db-sql/sql/query/list_unchecked_blocks.sql b/crates/node-db-sql/sql/query/list_unchecked_blocks.sql
@@ -3,7 +3,7 @@ SELECT
     block.number,
     block.timestamp_secs,
     block.timestamp_nanos,
-    solution_set.content_hash
+    solution_set.content_addr
 FROM
     block
     LEFT JOIN block_solution_set ON block.id = block_solution_set.block_id
diff --git a/crates/node-db/src/lib.rs b/crates/node-db/src/lib.rs
@@ -73,14 +73,14 @@ pub fn insert_block(tx: &Transaction, block: &Block) -> rusqlite::Result<Content
     // Insert the header.
     let secs = block.timestamp.as_secs();
     let nanos = block.timestamp.subsec_nanos() as u64;
-    let solution_set_hashes: Vec<ContentAddress> =
+    let solution_set_addrs: Vec<ContentAddress> =
         block.solution_sets.iter().map(content_addr).collect();
     let block_address = essential_hash::block_addr::from_block_and_solution_set_addrs_slice(
         block,
-        &solution_set_hashes,
+        &solution_set_addrs,
     );
 
-    // TODO: Use real parent block address once blocks have parent hashes.
+    // TODO: Use real parent block address once blocks have parent addresses.
     let parent_block_address = ContentAddress([0; 32]);
 
     tx.execute(
@@ -104,32 +104,32 @@ pub fn insert_block(tx: &Transaction, block: &Block) -> rusqlite::Result<Content
     for (ix, (solution_set, ca)) in block
         .solution_sets
         .iter()
-        .zip(solution_set_hashes)
+        .zip(solution_set_addrs)
         .enumerate()
     {
         // Insert the solution set.
         stmt_solution_set.execute(named_params! {
-            ":content_hash": ca.0,
+            ":content_addr": ca.0,
         })?;
 
         // Create a mapping between the block and the solution set.
         stmt_block_solution_set.execute(named_params! {
             ":block_address": block_address.0,
-            ":solution_set_hash": &ca.0,
+            ":solution_set_addr": &ca.0,
             ":solution_set_index": ix,
         })?;
 
         // Insert solutions.
         for (solution_ix, solution) in solution_set.solutions.iter().enumerate() {
             stmt_solution.execute(named_params! {
-                ":solution_set_hash": ca.0,
+                ":solution_set_addr": ca.0,
                 ":solution_index": solution_ix,
                 ":contract_addr": solution.predicate_to_solve.contract.0,
                 ":predicate_addr": solution.predicate_to_solve.predicate.0,
             })?;
             for (mutation_ix, mutation) in solution.state_mutations.iter().enumerate() {
                 stmt_mutation.execute(named_params! {
-                    ":solution_set_hash": ca.0,
+                    ":solution_set_addr": ca.0,
                     ":solution_index": solution_ix,
                     ":mutation_index": mutation_ix,
                     ":key": blob_from_words(&mutation.key),
@@ -138,7 +138,7 @@ pub fn insert_block(tx: &Transaction, block: &Block) -> rusqlite::Result<Content
             }
             for (pred_data_ix, pred_data) in solution.predicate_data.iter().enumerate() {
                 stmt_pred_data.execute(named_params! {
-                    ":solution_set_hash": ca.0,
+                    ":solution_set_addr": ca.0,
                     ":solution_index": solution_ix,
                     ":pred_data_index": pred_data_ix,
                     ":value": blob_from_words(pred_data)
@@ -171,13 +171,13 @@ pub fn finalize_block(conn: &Connection, block_address: &ContentAddress) -> rusq
 pub fn insert_failed_block(
     conn: &Connection,
     block_address: &ContentAddress,
-    solution_set_hash: &ContentAddress,
+    solution_set_addr: &ContentAddress,
 ) -> rusqlite::Result<()> {
     conn.execute(
         sql::insert::FAILED_BLOCK,
         named_params! {
             ":block_address": block_address.0,
-            ":solution_set_hash": solution_set_hash.0,
+            ":solution_set_addr": solution_set_addr.0,
         },
     )?;
     Ok(())
@@ -256,7 +256,7 @@ pub fn get_solution_set(tx: &Transaction, ca: &ContentAddress) -> Result<Solutio
     for (solution_ix, solution) in solutions.iter_mut().enumerate() {
         // Fetch the mutations.
         let mut mutation_rows = mutations_stmt.query(named_params! {
-            ":content_hash": ca.0,
+            ":content_addr": ca.0,
             ":solution_index": solution_ix,
         })?;
         while let Some(mutation_row) = mutation_rows.next()? {
@@ -269,7 +269,7 @@ pub fn get_solution_set(tx: &Transaction, ca: &ContentAddress) -> Result<Solutio
 
         // Fetch the predicate data.
         let mut pred_data_rows = pred_data_stmt.query(named_params! {
-            ":content_hash": ca.0,
+            ":content_addr": ca.0,
             ":solution_index": solution_ix,
         })?;
         while let Some(pred_data_row) = pred_data_rows.next()? {
@@ -338,8 +338,8 @@ pub fn get_block(
             ":block_address": block_address.0,
         },
         |row| {
-            let solution_hash: Hash = row.get("content_hash")?;
-            Ok(ContentAddress(solution_hash))
+            let solution_addr: Hash = row.get("content_addr")?;
+            Ok(ContentAddress(solution_addr))
         },
     )?;
 
@@ -433,13 +433,13 @@ pub fn list_blocks(tx: &Transaction, block_range: Range<Word>) -> Result<Vec<Blo
             let block_number: Word = row.get("number")?;
             let timestamp_secs: u64 = row.get("timestamp_secs")?;
             let timestamp_nanos: u32 = row.get("timestamp_nanos")?;
-            let solution_set_hash: Hash = row.get("content_hash")?;
+            let solution_set_addr: Hash = row.get("content_addr")?;
             let timestamp = Duration::new(timestamp_secs, timestamp_nanos);
             Ok((
                 block_address,
                 block_number,
                 timestamp,
-                ContentAddress(solution_set_hash),
+                ContentAddress(solution_set_addr),
             ))
         },
     )?;
@@ -500,13 +500,13 @@ pub fn list_blocks_by_time(
             let block_number: Word = row.get("number")?;
             let timestamp_secs: u64 = row.get("timestamp_secs")?;
             let timestamp_nanos: u32 = row.get("timestamp_nanos")?;
-            let solution_set_hash: Hash = row.get("content_hash")?;
+            let solution_set_addr: Hash = row.get("content_addr")?;
             let timestamp = Duration::new(timestamp_secs, timestamp_nanos);
             Ok((
                 block_address,
                 block_number,
                 timestamp,
-                ContentAddress(solution_set_hash),
+                ContentAddress(solution_set_addr),
             ))
         },
     )?;
@@ -558,15 +558,15 @@ pub fn list_failed_blocks(
         },
         |row| {
             let block_number: Word = row.get("number")?;
-            let solution_set_hash: Hash = row.get("content_hash")?;
-            Ok((block_number, ContentAddress(solution_set_hash)))
+            let solution_set_addr: Hash = row.get("content_addr")?;
+            Ok((block_number, ContentAddress(solution_set_addr)))
         },
     )?;
 
     let mut failed_blocks = vec![];
     for res in rows {
-        let (block_number, solution_set_hash) = res?;
-        failed_blocks.push((block_number, solution_set_hash));
+        let (block_number, solution_set_addr) = res?;
+        failed_blocks.push((block_number, solution_set_addr));
     }
     Ok(failed_blocks)
 }
@@ -587,7 +587,7 @@ pub fn list_unchecked_blocks(
             let block_number: Word = row.get("number")?;
             let timestamp_secs: u64 = row.get("timestamp_secs")?;
             let timestamp_nanos: u32 = row.get("timestamp_nanos")?;
-            let solution_set_addr: Hash = row.get("content_hash")?;
+            let solution_set_addr: Hash = row.get("content_addr")?;
             let timestamp = Duration::new(timestamp_secs, timestamp_nanos);
             Ok((
                 block_address,
diff --git a/crates/node-db/src/query_range/address.rs b/crates/node-db/src/query_range/address.rs
@@ -53,10 +53,10 @@ pub fn query_state_exclusive_block(
     key: &Key,
     block_address: &ContentAddress,
 ) -> Result<Option<Value>, QueryError> {
-    let Some(parent_hash) = crate::get_parent_block_address(tx, block_address)? else {
+    let Some(parent_addr) = crate::get_parent_block_address(tx, block_address)? else {
         return Ok(None);
     };
-    query_state_inclusive_block(tx, contract_ca, key, &parent_hash)
+    query_state_inclusive_block(tx, contract_ca, key, &parent_addr)
 }
 
 /// Query for the most recent version value of a key in a contracts state
diff --git a/crates/node-db/tests/insert.rs b/crates/node-db/tests/insert.rs
@@ -44,7 +44,7 @@ fn test_insert_block() {
         for solution_set in block.solution_sets.iter() {
             // Verify solution set was inserted
             let solution_set_address = &content_addr(solution_set);
-            let query = "SELECT 1 FROM solution_set WHERE content_hash = ?";
+            let query = "SELECT 1 FROM solution_set WHERE content_addr = ?";
             let mut stmt = conn.prepare(query).unwrap();
             let mut rows = stmt.query([&solution_set_address.0]).unwrap();
             let row = rows.next().unwrap().unwrap();
@@ -55,7 +55,7 @@ fn test_insert_block() {
                 // Verify solution was inserted corectly
                 let query = "SELECT solution.contract_addr, solution.predicate_addr
                     FROM solution JOIN solution_set ON solution.solution_set_id = solution_set.id
-                    WHERE solution_set.content_hash = ? AND solution.solution_index = ?";
+                    WHERE solution_set.content_addr = ? AND solution.solution_index = ?";
                 let mut stmt = conn.prepare(query).unwrap();
                 let mut rows = stmt
                     .query(params![solution_set_address.0, solution_ix as i64])
@@ -77,7 +77,7 @@ fn test_insert_block() {
                     let query = "SELECT mutation.key FROM mutation
                     JOIN solution ON solution.id = mutation.solution_id
                     JOIN solution_set ON solution.solution_set_id = solution_set.id
-                    WHERE solution_set.content_hash = ? AND mutation.mutation_index = ? AND solution.solution_index = ?
+                    WHERE solution_set.content_addr = ? AND mutation.mutation_index = ? AND solution.solution_index = ?
                     ORDER BY mutation.mutation_index ASC";
                     let mut stmt = conn.prepare(query).unwrap();
                     let mut result = stmt
@@ -101,7 +101,7 @@ fn test_insert_block() {
                     let query = "SELECT pred_data.value FROM pred_data
                         JOIN solution ON solution.id = pred_data.solution_id
                         JOIN solution_set ON solution.solution_set_id = solution_set.id
-                        WHERE solution.solution_index = ? AND pred_data.pred_data_index = ? AND solution_set.content_hash = ?";
+                        WHERE solution.solution_index = ? AND pred_data.pred_data_index = ? AND solution_set.content_addr = ?";
                     let mut stmt = conn.prepare(query).unwrap();
                     let mut pred_data_result = stmt
                         .query_map(params![solution_ix, pdi, solution_set_address.0], |row| {
@@ -235,26 +235,26 @@ fn test_failed_block() {
 
     // Insert failed block.
     let block_address = content_addr(&blocks[0]);
-    let solution_set_hash = content_addr(blocks[0].solution_sets.first().unwrap());
-    node_db::insert_failed_block(&conn, &block_address, &solution_set_hash).unwrap();
+    let solution_set_addr = content_addr(blocks[0].solution_sets.first().unwrap());
+    node_db::insert_failed_block(&conn, &block_address, &solution_set_addr).unwrap();
 
     // Check failed blocks.
     let failed_blocks = node_db::list_failed_blocks(&conn, 0..(NUM_BLOCKS + 10)).unwrap();
     assert_eq!(failed_blocks.len(), 1);
     assert_eq!(failed_blocks[0].0, blocks[0].number);
-    assert_eq!(failed_blocks[0].1, solution_set_hash);
+    assert_eq!(failed_blocks[0].1, solution_set_addr);
 
     // Same failed block should not be inserted again.
-    node_db::insert_failed_block(&conn, &block_address, &solution_set_hash).unwrap();
+    node_db::insert_failed_block(&conn, &block_address, &solution_set_addr).unwrap();
     let failed_blocks = node_db::list_failed_blocks(&conn, 0..(NUM_BLOCKS + 10)).unwrap();
     assert_eq!(failed_blocks.len(), 1);
     assert_eq!(failed_blocks[0].0, blocks[0].number);
-    assert_eq!(failed_blocks[0].1, solution_set_hash);
+    assert_eq!(failed_blocks[0].1, solution_set_addr);
 
     // Insert another failed block.
     let block_address = content_addr(&blocks[1]);
-    let solution_set_hash = content_addr(blocks[1].solution_sets.first().unwrap());
-    node_db::insert_failed_block(&conn, &block_address, &solution_set_hash).unwrap();
+    let solution_set_addr = content_addr(blocks[1].solution_sets.first().unwrap());
+    node_db::insert_failed_block(&conn, &block_address, &solution_set_addr).unwrap();
 
     let failed_blocks = node_db::with_tx_dropped(&mut conn, |tx| {
         let r = node_db::list_blocks(tx, 0..(NUM_BLOCKS + 10)).unwrap();
@@ -267,7 +267,7 @@ fn test_failed_block() {
 
     assert_eq!(failed_blocks.len(), 2);
     assert_eq!(failed_blocks[1].0, blocks[1].number);
-    assert_eq!(failed_blocks[1].1, solution_set_hash);
+    assert_eq!(failed_blocks[1].1, solution_set_addr);
 }
 
 #[test]
diff --git a/crates/node/src/test_utils.rs b/crates/node/src/test_utils.rs
diff --git a/crates/node/src/validation/tests.rs b/crates/node/src/validation/tests.rs

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ INSERT OR IGNORE INTO`
`3`	`3`	`VALUES`
`4`	`4`	`(`
`5`	`5`	`(SELECT id FROM block WHERE block.block_address = :block_address LIMIT 1),`
`6`		`- (SELECT id FROM solution_set WHERE solution_set.content_hash = :solution_set_hash LIMIT 1),`
	`6`	`+ (SELECT id FROM solution_set WHERE solution_set.content_addr = :solution_set_addr LIMIT 1),`
`7`	`7`	`:solution_set_index`
`8`	`8`	`);`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ INSERT`
`3`	`3`	`VALUES`
`4`	`4`	`(`
`5`	`5`	`(SELECT id FROM block WHERE block.block_address = :block_address LIMIT 1),`
`6`		`- (SELECT id FROM solution_set WHERE solution_set.content_hash = :solution_set_hash LIMIT 1)`
	`6`	`+ (SELECT id FROM solution_set WHERE solution_set.content_addr = :solution_set_addr LIMIT 1)`
`7`	`7`	`);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ VALUES`
`14`	`14`	`solution`
`15`	`15`	`JOIN solution_set ON solution_set.id = solution.solution_set_id`
`16`	`16`	`WHERE`
`17`		`- solution_set.content_hash = :solution_set_hash AND solution.solution_index = :solution_index`
	`17`	`+ solution_set.content_addr = :solution_set_addr AND solution.solution_index = :solution_index`
`18`	`18`	`LIMIT`
`19`	`19`	`1`
`20`	`20`	`), :mutation_index, :key, :value`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ VALUES`
`13`	`13`	`solution`
`14`	`14`	`JOIN solution_set ON solution_set.id = solution.solution_set_id`
`15`	`15`	`WHERE`
`16`		`- solution_set.content_hash = :solution_set_hash AND solution.solution_index = :solution_index`
	`16`	`+ solution_set.content_addr = :solution_set_addr AND solution.solution_index = :solution_index`
`17`	`17`	`LIMIT`
`18`	`18`	`1`
`19`	`19`	`), :pred_data_index, :value`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ VALUES`
`8`	`8`	`FROM`
`9`	`9`	`solution_set`
`10`	`10`	`WHERE`
`11`		`- content_hash = :solution_set_hash`
	`11`	`+ content_addr = :solution_set_addr`
`12`	`12`	`LIMIT`
`13`	`13`	`1`
`14`	`14`	`), :solution_index, :contract_addr, :predicate_addr`