Skip to content

Commit c4fa60f

Browse files
claudiosdcdr-orlovsky
authored andcommitted
Make the necessary adjustments to related test methods.
1 parent 333db7e commit c4fa60f

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
@@ -2401,16 +2401,16 @@ mod test {
24012401
.iter()
24022402
.map(|item| {
24032403
let mut encoder = std::io::Cursor::new(vec![]);
2404-
item.0.strict_encode(&mut encoder).unwrap();
2405-
item.1.clone().strict_encode(&mut encoder).unwrap();
2404+
item.0.commit_encode(&mut encoder);
2405+
item.1.clone().commit_encode(&mut encoder);
24062406
MerkleNode::hash(&encoder.into_inner())
24072407
})
24082408
.collect();
24092409

24102410
let final_node = merklize("", &merkle_nodes[..], 0);
24112411

24122412
let mut computed_encoding = vec![];
2413-
final_node.strict_encode(&mut computed_encoding).unwrap();
2413+
final_node.commit_encode(&mut computed_encoding);
24142414

24152415
assert_eq!(original_encoding, computed_encoding);
24162416
}

src/contract/nodes.rs

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ mod test {
764764
script: Default::default(),
765765
};
766766

767+
// Strict encode
767768
let mut encoder = vec![];
768769
transition
769770
.transition_type
@@ -782,13 +783,30 @@ mod test {
782783
transition.script.strict_encode(&mut encoder).unwrap();
783784

784785
let mut encoder1 = vec![];
785-
let mut encoder2 = vec![];
786-
787-
transition.clone().commit_encode(&mut encoder1);
788-
transition.clone().strict_encode(&mut encoder2).unwrap();
786+
transition.clone().strict_encode(&mut encoder1).unwrap();
789787

790-
assert_eq!(encoder1, encoder2);
791788
assert_eq!(encoder, encoder1);
789+
790+
// Commit encode
791+
let transition2 = transition.clone();
792+
let mut encoder2 = vec![];
793+
transition2
794+
.transition_type
795+
.commit_encode(&mut encoder2);
796+
transition2.metadata.commit_encode(&mut encoder2);
797+
transition2
798+
.parent_owned_rights
799+
.commit_encode(&mut encoder2);
800+
transition2.owned_rights.commit_encode(&mut encoder2);
801+
transition2
802+
.public_rights
803+
.commit_encode(&mut encoder2);
804+
transition2.script.commit_encode(&mut encoder2);
805+
806+
let mut encoder3 = vec![];
807+
transition.clone().commit_encode(&mut encoder3);
808+
809+
assert_eq!(encoder2, encoder3);
792810
}
793811

794812
#[test]
@@ -809,7 +827,7 @@ mod test {
809827
);
810828
assert_eq!(
811829
transition.node_id().to_hex(),
812-
"72a375d75c925aee4e6c077b37cd85eb8a0d3a598d03c3ac038e31a46b145ac6"
830+
"e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2"
813831
);
814832

815833
assert_eq!(genesis.transition_type(), None);
@@ -1025,7 +1043,7 @@ mod test {
10251043
);
10261044
assert_eq!(
10271045
transition.clone().consensus_commit(),
1028-
NodeId::from_hex("72a375d75c925aee4e6c077b37cd85eb8a0d3a598d03c3ac038e31a46b145ac6")
1046+
NodeId::from_hex("e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2")
10291047
.unwrap()
10301048
);
10311049

@@ -1039,7 +1057,7 @@ mod test {
10391057
);
10401058
assert_eq!(
10411059
transition.clone().consensus_commit(),
1042-
NodeId::from_hex("0306cc6881cacd66ba1f842fb0b51481789d2580baf0089472ad207989e58670")
1060+
NodeId::from_hex("e2f910dbebc96dfc804175860758ce5283d61a841c96108550db8c53289298c2")
10431061
.unwrap()
10441062
);
10451063
}

0 commit comments

Comments
 (0)