Merge pull request #15 from casper-ecosystem/rust-toolchain-fix

Old toolchain gives zeroize error on cloning
casper-ecosystem · Aug 6, 2021 · 1d37e76 · 1d37e76
2 parents 25358cd + 28ec2a9
commit 1d37e76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/contract/src/errors.rs b/contract/src/errors.rs
@@ -7,8 +7,8 @@ pub enum Error {
     ThresholdViolation = 3,
     MaxKeysLimit = 4,
     DuplicateKey = 5,
-    KeyManagementThresholdError = 6,
-    DeploymentThresholdError = 7,
+    KeyManagementThreshold = 6,
+    DeploymentThreshold = 7,
     InsufficientTotalWeight = 8,
     MissingArgument0 = 20,
     MissingArgument1 = 21,

diff --git a/contract/src/main.rs b/contract/src/main.rs
@@ -115,8 +115,8 @@ fn update_key_weight(account: AccountHash, weight: Weight) {
 fn set_threshold(permission_level: ActionType, threshold: Weight) -> Result<(), Error> {
     match account::set_action_threshold(permission_level, threshold) {
         Ok(()) => Ok(()),
-        Err(SetThresholdFailure::KeyManagementThreshold) => Err(Error::KeyManagementThresholdError),
-        Err(SetThresholdFailure::DeploymentThreshold) => Err(Error::DeploymentThresholdError),
+        Err(SetThresholdFailure::KeyManagementThreshold) => Err(Error::KeyManagementThreshold),
+        Err(SetThresholdFailure::DeploymentThreshold) => Err(Error::DeploymentThreshold),
         Err(SetThresholdFailure::PermissionDeniedError) => Err(Error::PermissionDenied),
         Err(SetThresholdFailure::InsufficientTotalWeight) => Err(Error::InsufficientTotalWeight),
     }

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-12-16
+nightly-2021-06-17