Skip to content

Commit 7886afc

Browse files
claudiosdcdr-orlovsky
authored andcommitted
Make the necessary adjustments to related test methods.
1 parent d87d8c7 commit 7886afc

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

src/contract/assignments.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2313,16 +2313,16 @@ mod test {
23132313
.iter()
23142314
.map(|item| {
23152315
let mut encoder = std::io::Cursor::new(vec![]);
2316-
item.0.strict_encode(&mut encoder).unwrap();
2317-
item.1.clone().strict_encode(&mut encoder).unwrap();
2316+
item.0.commit_encode(&mut encoder);
2317+
item.1.clone().commit_encode(&mut encoder);
23182318
MerkleNode::hash(&encoder.into_inner())
23192319
})
23202320
.collect();
23212321

23222322
let final_node = merklize("", &merkle_nodes[..], 0);
23232323

23242324
let mut computed_encoding = vec![];
2325-
final_node.strict_encode(&mut computed_encoding).unwrap();
2325+
final_node.commit_encode(&mut computed_encoding);
23262326

23272327
assert_eq!(original_encoding, computed_encoding);
23282328
}

src/contract/nodes.rs

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@ mod test {
773773
script: Default::default(),
774774
};
775775

776+
// Strict encode
776777
let mut encoder = vec![];
777778
transition
778779
.transition_type
@@ -791,13 +792,30 @@ mod test {
791792
transition.script.strict_encode(&mut encoder).unwrap();
792793

793794
let mut encoder1 = vec![];
794-
let mut encoder2 = vec![];
795-
796-
transition.clone().commit_encode(&mut encoder1);
797-
transition.clone().strict_encode(&mut encoder2).unwrap();
795+
transition.clone().strict_encode(&mut encoder1).unwrap();
798796

799-
assert_eq!(encoder1, encoder2);
800797
assert_eq!(encoder, encoder1);
798+
799+
// Commit encode
800+
let transition2 = transition.clone();
801+
let mut encoder2 = vec![];
802+
transition2
803+
.transition_type
804+
.commit_encode(&mut encoder2);
805+
transition2.metadata.commit_encode(&mut encoder2);
806+
transition2
807+
.parent_owned_rights
808+
.commit_encode(&mut encoder2);
809+
transition2.owned_rights.commit_encode(&mut encoder2);
810+
transition2
811+
.public_rights
812+
.commit_encode(&mut encoder2);
813+
transition2.script.commit_encode(&mut encoder2);
814+
815+
let mut encoder3 = vec![];
816+
transition.clone().commit_encode(&mut encoder3);
817+
818+
assert_eq!(encoder2, encoder3);
801819
}
802820

803821
#[test]
@@ -818,7 +836,7 @@ mod test {
818836
);
819837
assert_eq!(
820838
transition.node_id().to_hex(),
821-
"72a375d75c925aee4e6c077b37cd85eb8a0d3a598d03c3ac038e31a46b145ac6"
839+
"e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2"
822840
);
823841

824842
assert_eq!(genesis.transition_type(), None);
@@ -1034,7 +1052,7 @@ mod test {
10341052
);
10351053
assert_eq!(
10361054
transition.clone().consensus_commit(),
1037-
NodeId::from_hex("72a375d75c925aee4e6c077b37cd85eb8a0d3a598d03c3ac038e31a46b145ac6")
1055+
NodeId::from_hex("e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2")
10381056
.unwrap()
10391057
);
10401058

@@ -1048,7 +1066,7 @@ mod test {
10481066
);
10491067
assert_eq!(
10501068
transition.clone().consensus_commit(),
1051-
NodeId::from_hex("0306cc6881cacd66ba1f842fb0b51481789d2580baf0089472ad207989e58670")
1069+
NodeId::from_hex("e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2")
10521070
.unwrap()
10531071
);
10541072
}

0 commit comments

Comments
 (0)