fix merge

Jiloc · Jiloc · commit 1fdb78ac80fb · 2025-07-22T00:04:36.000+01:00
diff --git a/clarity-serialization/src/types/signatures.rs b/clarity-serialization/src/types/signatures.rs
@@ -455,7 +455,8 @@ impl TypeSignature {
             | StacksEpochId::Epoch24
             | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30
-            | StacksEpochId::Epoch31 => self.admits_type_v2_1(other),
+            | StacksEpochId::Epoch31
+            | StacksEpochId::Epoch32 => self.admits_type_v2_1(other),
             StacksEpochId::Epoch10 => Err(CodecError::Expect("epoch 1.0 not supported".into())),
         }
     }
@@ -663,7 +664,8 @@ impl TypeSignature {
             | StacksEpochId::Epoch24
             | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30
-            | StacksEpochId::Epoch31 => self.canonicalize_v2_1(),
+            | StacksEpochId::Epoch31
+            | StacksEpochId::Epoch32 => self.canonicalize_v2_1(),
         }
     }
 
@@ -957,7 +959,8 @@ impl TypeSignature {
             | StacksEpochId::Epoch24
             | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30
-            | StacksEpochId::Epoch31 => Self::least_supertype_v2_1(a, b),
+            | StacksEpochId::Epoch31
+            | StacksEpochId::Epoch32 => Self::least_supertype_v2_1(a, b),
             StacksEpochId::Epoch10 => Err(CodecError::Expect("epoch 1.0 not supported".into())),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,8 @@ impl TypeSignature {`
`455`	`455`	`\| StacksEpochId::Epoch24`
`456`	`456`	`\| StacksEpochId::Epoch25`
`457`	`457`	`\| StacksEpochId::Epoch30`
`458`		`- \| StacksEpochId::Epoch31 => self.admits_type_v2_1(other),`
	`458`	`+ \| StacksEpochId::Epoch31`
	`459`	`+ \| StacksEpochId::Epoch32 => self.admits_type_v2_1(other),`
`459`	`460`	`StacksEpochId::Epoch10 => Err(CodecError::Expect("epoch 1.0 not supported".into())),`
`460`	`461`	`}`
`461`	`462`	`}`
`@@ -663,7 +664,8 @@ impl TypeSignature {`
`663`	`664`	`\| StacksEpochId::Epoch24`
`664`	`665`	`\| StacksEpochId::Epoch25`
`665`	`666`	`\| StacksEpochId::Epoch30`
`666`		`- \| StacksEpochId::Epoch31 => self.canonicalize_v2_1(),`
	`667`	`+ \| StacksEpochId::Epoch31`
	`668`	`+ \| StacksEpochId::Epoch32 => self.canonicalize_v2_1(),`
`667`	`669`	`}`
`668`	`670`	`}`
`669`	`671`
`@@ -957,7 +959,8 @@ impl TypeSignature {`
`957`	`959`	`\| StacksEpochId::Epoch24`
`958`	`960`	`\| StacksEpochId::Epoch25`
`959`	`961`	`\| StacksEpochId::Epoch30`
`960`		`- \| StacksEpochId::Epoch31 => Self::least_supertype_v2_1(a, b),`
	`962`	`+ \| StacksEpochId::Epoch31`
	`963`	`+ \| StacksEpochId::Epoch32 => Self::least_supertype_v2_1(a, b),`
`961`	`964`	`StacksEpochId::Epoch10 => Err(CodecError::Expect("epoch 1.0 not supported".into())),`
`962`	`965`	`}`
`963`	`966`	`}`