Merge pull request #1654 from radixdlt/tweak/add_missing_types_scrypt…

…o_bindgen Add missing types to `scrypto-bindgen`
radixdlt · Nov 23, 2023 · b95ec28 · b95ec28
2 parents bce6a7b + 4e3afd4
commit b95ec28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/simulator/src/scrypto_bindgen/translation.rs b/simulator/src/scrypto_bindgen/translation.rs
@@ -226,18 +226,15 @@ where
         TypeKind::Custom(ScryptoCustomTypeKind::Own) => match type_validation {
             TypeValidation::Custom(ScryptoCustomTypeValidation::Own(
                 OwnValidation::IsTypedObject(package_address, bp_name),
-            )) if package_address == Some(RESOURCE_PACKAGE)
-                && bp_name == FUNGIBLE_BUCKET_BLUEPRINT =>
-            {
-                "FungibleBucket".to_owned()
-            }
-            TypeValidation::Custom(ScryptoCustomTypeValidation::Own(
-                OwnValidation::IsTypedObject(package_address, bp_name),
-            )) if package_address == Some(RESOURCE_PACKAGE)
-                && bp_name == NON_FUNGIBLE_BUCKET_BLUEPRINT =>
-            {
-                "NonFungibleBucket".to_owned()
-            }
+            )) if package_address == Some(RESOURCE_PACKAGE) => match bp_name.as_str() {
+                FUNGIBLE_BUCKET_BLUEPRINT => "FungibleBucket".to_owned(),
+                NON_FUNGIBLE_BUCKET_BLUEPRINT => "NonFungibleBucket".to_owned(),
+                FUNGIBLE_PROOF_BLUEPRINT => "FungibleProof".to_owned(),
+                NON_FUNGIBLE_PROOF_BLUEPRINT => "NonFungibleProof".to_owned(),
+                FUNGIBLE_VAULT_BLUEPRINT => "FungibleVault".to_owned(),
+                NON_FUNGIBLE_VAULT_BLUEPRINT => "NonFungibleVault".to_owned(),
+                _ => "Own".to_owned(),
+            },
             TypeValidation::Custom(ScryptoCustomTypeValidation::Own(
                 OwnValidation::IsTypedObject(package_address, bp_name),
             )) if package_address.is_none()

diff --git a/transaction/src/signing/ed25519/signature.rs b/transaction/src/signing/ed25519/signature.rs
@@ -13,9 +13,6 @@ pub struct Ed25519Signature(
     #[cfg_attr(feature = "serde", serde(with = "hex::serde"))] pub [u8; Self::LENGTH],
 );
 
-/// Ed25519 signature verifier.
-pub struct Ed25519Verifier;
-
 impl Ed25519Signature {
     pub const LENGTH: usize = 64;
 

diff --git a/transaction/src/signing/secp256k1/signature.rs b/transaction/src/signing/secp256k1/signature.rs
@@ -13,9 +13,6 @@ pub struct Secp256k1Signature(
     #[cfg_attr(feature = "serde", serde(with = "hex::serde"))] pub [u8; Self::LENGTH],
 );
 
-/// Secp256k1 signature verifier.
-pub struct Secp256k1Verifier;
-
 impl Secp256k1Signature {
     pub const LENGTH: usize = 65; // recovery id + signature