Remove spurious Hasher: BorshSerialize + BorshDeserialize bounds

preston-evans98 · preston-evans98 · commit dc5546088954 · 2024-06-27T15:00:02.000-05:00
diff --git a/src/types/proof/definition.rs b/src/types/proof/definition.rs
@@ -37,6 +37,7 @@ pub struct SparseMerkleProof<H: SimpleHasher> {
     siblings: Vec<SparseMerkleNode>,
 
     /// A marker type showing which hash function is used in this proof.
+    #[borsh(bound(serialize = "", deserialize = ""))]
     phantom_hasher: PhantomData<H>,
 }
 
@@ -511,7 +512,9 @@ impl<H: SimpleHasher> SparseMerkleProof<H> {
 }
 
 #[derive(Debug, Serialize, Deserialize, borsh::BorshSerialize, borsh::BorshDeserialize)]
-pub struct UpdateMerkleProof<H: SimpleHasher>(Vec<SparseMerkleProof<H>>);
+pub struct UpdateMerkleProof<H: SimpleHasher>(
+    #[borsh(bound(serialize = "", deserialize = ""))] Vec<SparseMerkleProof<H>>,
+);
 
 impl<H: SimpleHasher> UpdateMerkleProof<H> {
     pub fn new(merkle_proofs: Vec<SparseMerkleProof<H>>) -> Self {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ pub struct SparseMerkleProof<H: SimpleHasher> {`
`37`	`37`	`siblings: Vec<SparseMerkleNode>,`
`38`	`38`
`39`	`39`	`/// A marker type showing which hash function is used in this proof.`
	`40`	`+ #[borsh(bound(serialize = "", deserialize = ""))]`
`40`	`41`	`phantom_hasher: PhantomData<H>,`
`41`	`42`	`}`
`42`	`43`
`@@ -511,7 +512,9 @@ impl<H: SimpleHasher> SparseMerkleProof<H> {`
`511`	`512`	`}`
`512`	`513`
`513`	`514`	`#[derive(Debug, Serialize, Deserialize, borsh::BorshSerialize, borsh::BorshDeserialize)]`
`514`		`-pub struct UpdateMerkleProof<H: SimpleHasher>(Vec<SparseMerkleProof<H>>);`
	`515`	`+pub struct UpdateMerkleProof<H: SimpleHasher>(`
	`516`	`+ #[borsh(bound(serialize = "", deserialize = ""))] Vec<SparseMerkleProof<H>>,`
	`517`	`+);`
`515`	`518`
`516`	`519`	`impl<H: SimpleHasher> UpdateMerkleProof<H> {`
`517`	`520`	`pub fn new(merkle_proofs: Vec<SparseMerkleProof<H>>) -> Self {`