Skip to content

Commit

Permalink
Make test on merkle root computation more explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfauvel
sfauvel committed Apr 2, 2024
1 parent 33060ae commit 59ea0ad
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 50 deletions.
19 changes: 1 addition & 18 deletions mithril-aggregator/src/database/provider/cardano_transaction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,6 @@ impl<'client> InsertCardanoTransactionProvider<'client> {
}

fn get_insert_condition(&self, record: &CardanoTransactionRecord) -> StdResult<WhereCondition> {
// let expression =
// "(transaction_hash, block_number, slot_number, block_hash, immutable_file_number) values (?1, ?2, ?3, ?4, ?5)";
// let parameters = vec![
// Value::String(record.transaction_hash.clone()),
// Value::Integer(record.block_number.try_into()?),
// Value::Integer(record.slot_number.try_into()?),
// Value::String(record.block_hash.clone()),
// Value::Integer(record.immutable_file_number.try_into()?),
// ];

// Ok(WhereCondition::new(expression, parameters))
self.get_insert_many_condition(vec![record.clone()])
}

Expand Down Expand Up @@ -200,12 +189,6 @@ impl<'client> InsertCardanoTransactionProvider<'client> {

let values: Vec<Value> = values?.into_iter().flatten().collect();

// let values = transactions_records
// .into_iter()
// .flat_map(map_record) // Vec<StdResult<Vec<Value>>>
// .flatten()
// .collect::<Vec<Value>>();

Ok(WhereCondition::new(
format!("{columns} values {}", values_columns.join(", ")).as_str(),
values,
Expand All @@ -224,7 +207,7 @@ impl<'client> Provider<'client> for InsertCardanoTransactionProvider<'client> {
let aliases = SourceAlias::new(&[("{:cardano_tx:}", "cardano_tx")]);
let projection = Self::Entity::get_projection().expand(aliases);

format!("insert or ignore into cardano_tx {condition} returning {projection}")
format!("insert or ignore into cardano_tx {condition} returning {projection}")
}
}

Expand Down
68 changes: 53 additions & 15 deletions mithril-common/src/signable_builder/cardano_transactions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,29 +158,39 @@ mod tests {
}

#[tokio::test]
async fn test_compute_merkle_root() {
let transaction_1 = CardanoTransaction::new("tx-hash-123", 10, 1, "block_hash", 1);
let transaction_2 = CardanoTransaction::new("tx-hash-456", 20, 2, "block_hash", 1);
let transaction_3 = CardanoTransaction::new("tx-hash-789", 30, 3, "block_hash", 1);
let transaction_4 = CardanoTransaction::new("tx-hash-abc", 40, 4, "block_hash", 1);

let transactions_set_reference = vec![
transaction_1.clone(),
transaction_2.clone(),
transaction_3.clone(),
];
async fn test_compute_merkle_root_in_same_block_range() {
let transaction_1 = CardanoTransaction::new("tx-hash-123", 1, 10, "block_hash", 1);
let transaction_2 = CardanoTransaction::new("tx-hash-456", 2, 20, "block_hash", 1);
let transaction_3 = CardanoTransaction::new("tx-hash-789", 3, 30, "block_hash", 1);
let transaction_4 = CardanoTransaction::new("tx-hash-abc", 4, 40, "block_hash", 1);

for tx in [
&transaction_1,
&transaction_2,
&transaction_3,
&transaction_4,
] {
assert!(
tx.block_number < BlockRange::LENGTH,
"all manipulated transactions should be in the same block range"
);
}

let cardano_transaction_signable_builder = CardanoTransactionsSignableBuilder::new(
Arc::new(DumbTransactionParser::new(
transactions_set_reference.clone(),
)),
Arc::new(DumbTransactionParser::new(vec![])),
Arc::new(MockTransactionStore::new()),
Path::new("/tmp"),
create_logger(),
);

let merkle_root_reference = cardano_transaction_signable_builder
.compute_merkle_root(&transactions_set_reference)
.compute_merkle_root(&vec![
transaction_1.clone(),
transaction_2.clone(),
transaction_3.clone(),
])
.unwrap();

{
let transactions_set = vec![transaction_1.clone()];
let mk_root = cardano_transaction_signable_builder
Expand Down Expand Up @@ -222,6 +232,34 @@ mod tests {
}
}

#[tokio::test]
async fn test_compute_merkle_root_order_of_block_range_does_not_matter() {
let transaction_1 =
CardanoTransaction::new("tx-hash-123", BlockRange::LENGTH - 1, 10, "block_hash", 1);
let transaction_2 =
CardanoTransaction::new("tx-hash-456", BlockRange::LENGTH + 1, 20, "block_hash", 1);

let cardano_transaction_signable_builder = CardanoTransactionsSignableBuilder::new(
Arc::new(DumbTransactionParser::new(vec![])),
Arc::new(MockTransactionStore::new()),
Path::new("/tmp"),
create_logger(),
);

let merkle_root_reference = cardano_transaction_signable_builder
.compute_merkle_root(&vec![transaction_1.clone(), transaction_2.clone()])

Check warning

Code scanning / clippy

useless use of vec! Warning

useless use of vec!
.unwrap();

// Transactions in two different block range compute the same merkle root as long as their
// order in their block range is the same but the order of appearance of the block range
// doesn't matter.
let mk_root = cardano_transaction_signable_builder
.compute_merkle_root(&vec![transaction_2.clone(), transaction_1.clone()])

Check warning

Code scanning / clippy

useless use of vec! Warning

useless use of vec!
.unwrap();

assert_eq!(merkle_root_reference, mk_root);
}

#[tokio::test]
async fn test_compute_signable() {
// Arrange
Expand Down
17 changes: 0 additions & 17 deletions mithril-signer/src/database/provider/cardano_transaction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,6 @@ impl<'client> InsertCardanoTransactionProvider<'client> {
}

fn get_insert_condition(&self, record: &CardanoTransactionRecord) -> StdResult<WhereCondition> {
// let expression =
// "(transaction_hash, block_number, slot_number, block_hash, immutable_file_number) values (?1, ?2, ?3, ?4, ?5)";
// let parameters = vec![
// Value::String(record.transaction_hash.clone()),
// Value::Integer(record.block_number.try_into()?),
// Value::Integer(record.slot_number.try_into()?),
// Value::String(record.block_hash.clone()),
// Value::Integer(record.immutable_file_number.try_into()?),
// ];

// Ok(WhereCondition::new(expression, parameters))
self.get_insert_many_condition(vec![record.clone()])
}

Expand Down Expand Up @@ -198,12 +187,6 @@ impl<'client> InsertCardanoTransactionProvider<'client> {

let values: Vec<Value> = values?.into_iter().flatten().collect();

// let values = transactions_records
// .into_iter()
// .flat_map(map_record) // Vec<StdResult<Vec<Value>>>
// .flatten()
// .collect::<Vec<Value>>();

Ok(WhereCondition::new(
format!("{columns} values {}", values_columns.join(", ")).as_str(),
values,
Expand Down

0 comments on commit 59ea0ad

Please sign in to comment.