PR fixes

odradev · Dec 5, 2023 · de73e5d · de73e5d
1 parent e49c952
commit de73e5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/src/contract_env.rs b/core/src/contract_env.rs
@@ -6,7 +6,6 @@ use casper_types::crypto::PublicKey;
 use crate::key_maker;
 pub use crate::ContractContext;
 use crate::ExecutionError::CouldntDeserializeSignature;
-use crate::OdraError::ExecutionError;
 
 pub struct ContractEnv {
     index: u32,
@@ -132,7 +131,7 @@ impl ContractEnv {
         public_key: &PublicKey
     ) -> bool {
         let (signature, _) = casper_types::crypto::Signature::from_bytes(signature.as_slice())
-            .unwrap_or_else(|_| self.revert(ExecutionError(CouldntDeserializeSignature)));
+            .unwrap_or_else(|_| self.revert(CouldntDeserializeSignature));
         casper_types::crypto::verify(message.as_slice(), &signature, public_key).is_ok()
     }
 }
diff --git a/core/src/crypto.rs b/core/src/crypto.rs
@@ -13,8 +13,13 @@ pub fn generate_key_pairs(amount: u8) -> BTreeMap<Address, (SecretKey, PublicKey
         // Create an AccountHash from a public key.
         let account_addr = AccountHash::from(&public_key);
 
+        let address = match account_addr.try_into() {
+            Ok(address) => address,
+            Err(_) => continue
+        };
+
         // Create a GenesisAccount.
-        accounts.insert(account_addr.try_into().unwrap(), (secret_key, public_key));
+        accounts.insert(address, (secret_key, public_key));
     }
     accounts
 }