cleanup

radixdlt · Nov 29, 2024 · 5623fde · 5623fde
1 parent 7818f76
commit 5623fde
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/crates/rules/src/lib.rs b/crates/rules/src/lib.rs
@@ -1,5 +1,4 @@
 #![allow(incomplete_features)]
-#![feature(inherent_associated_types)]
 #![feature(generic_const_exprs)]
 
 mod matrices;

diff --git a/crates/rules/src/roles/builder/confirmation_roles_builder_unit_tests.rs b/crates/rules/src/roles/builder/confirmation_roles_builder_unit_tests.rs
@@ -20,7 +20,7 @@ fn empty_is_err_confirmation() {
     let res = sut.build();
     assert_eq!(
         res,
-        ConfirmationRoleBuilder::RoleBuilderBuildResult::not_yet_valid(
+        Result::not_yet_valid(
             NotYetValidReason::RoleMustHaveAtLeastOneFactor
         )
     );

diff --git a/crates/rules/src/roles/builder/primary_roles_builder_unit_tests.rs b/crates/rules/src/roles/builder/primary_roles_builder_unit_tests.rs
@@ -20,7 +20,7 @@ fn empty_is_err_primary() {
     let res = sut.build();
     assert_eq!(
         res,
-        PrimaryRoleBuilder::RoleBuilderBuildResult::not_yet_valid(
+        Result::not_yet_valid(
             NotYetValidReason::RoleMustHaveAtLeastOneFactor
         )
     );
@@ -615,7 +615,7 @@ mod ledger {
             // Assert
             assert_eq!(
                 sut.build(),
-                SUT::RoleBuilderBuildResult::Err(RoleBuilderValidation::NotYetValid(
+                Err(RoleBuilderValidation::NotYetValid(
                     NotYetValidReason::PrimaryRoleWithThresholdCannotBeZeroWithFactors
                 ))
             );

diff --git a/crates/rules/src/roles/builder/recovery_roles_builder_unit_tests.rs b/crates/rules/src/roles/builder/recovery_roles_builder_unit_tests.rs
@@ -15,7 +15,7 @@ fn empty_is_err_recovery() {
     let res = sut.build();
     assert_eq!(
         res,
-        RecoveryRoleBuilder::RoleBuilderBuildResult::not_yet_valid(
+        Result::not_yet_valid(
             NotYetValidReason::RoleMustHaveAtLeastOneFactor
         )
     );

diff --git a/crates/rules/src/roles/builder/roles_builder.rs b/crates/rules/src/roles/builder/roles_builder.rs
@@ -328,9 +328,7 @@ impl<const R: u8> RoleBuilder<R> {
 }
 
 impl<const R: u8> RoleBuilder<R> {
-    pub type RoleBuilderBuildResult = Result<RoleWithFactorSourceIds<R>, RoleBuilderValidation>;
-
-    pub(crate) fn build(self) -> Self::RoleBuilderBuildResult {
+    pub(crate) fn build(self) -> Result<RoleWithFactorSourceIds<R>, RoleBuilderValidation> {
         self.validate().map(|_| {
             RoleWithFactorSourceIds::with_factors(
                 self.get_threshold(),