to_vec

redstone-finance · Oct 4, 2024 · 35ed57a · 35ed57a
1 parent 1195335
commit 35ed57a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/src/core/config_validation.sw b/src/core/config_validation.sw
@@ -9,13 +9,19 @@ trait Validation {
     fn validate_timestamps(self, payload: Payload) -> u64;
     fn validate_signer_count(self, values: Vec<Vec<u256>>);
     fn validate_signer(self, data_package: DataPackage, index: u64) -> u64;
-
 }
 
 impl Validation for Config {
-
     fn check_parameters(self) {
         assert_signers(self.signers, self.signer_count_threshold);
+
+        require(self.feed_ids.len() > 0, RedStoneError::EmptyFeedIds);
+        require(
+            self.feed_ids
+                .find_duplicate()
+                .is_none(),
+            RedStoneError::DuplicatedFeedId,
+        )
     }
 
     fn validate_timestamps(self, payload: Payload) -> u64 {
@@ -61,27 +67,26 @@ impl Validation for Config {
 
         s.unwrap()
     }
-
 }
 
-   fn assert_signers(allowed_signers: Vec<b256>, signer_count_threshold: u64) {
-        require(
-            allowed_signers
-                .len() > 0,
-            RedStoneError::EmptyAllowedSigners,
-        );
-        require(
-            allowed_signers
-                .len() >= signer_count_threshold,
-            RedStoneError::SignerCountThresholdToSmall,
-        );
-        require(
-            allowed_signers
-                .find_duplicate()
-                .is_none(),
-            RedStoneError::DuplicateSignerFound,
-        );
-    }
+fn assert_signers(allowed_signers: Vec<b256>, signer_count_threshold: u64) {
+    require(
+        allowed_signers
+            .len() > 0,
+        RedStoneError::EmptyAllowedSigners,
+    );
+    require(
+        allowed_signers
+            .len() >= signer_count_threshold,
+        RedStoneError::SignerCountThresholdToSmall,
+    );
+    require(
+        allowed_signers
+            .find_duplicate()
+            .is_none(),
+        RedStoneError::DuplicatedSigner,
+    );
+}
 
 #[test]
 fn test_validate_one_signer() {

diff --git a/src/core/errors.sw b/src/core/errors.sw
@@ -15,12 +15,10 @@ pub const SIGNER_NOT_RECOGNIZED = 0x4e20_0000;
 /// convert 3_276_800_000 + signer_count * feed_index + signer_index
 pub const DUPLICATED_VALUE_FOR_SIGNER = 0xc350_0000;
 
-
-
 pub enum RedStoneError {
     EmptyAllowedSigners: (),
+    EmptyFeedIds: (),
     SignerCountThresholdToSmall: (),
-    DuplicateSignerFound: (),
-    SenderIsNotTheOwner: (Identity, Option<Identity>),
-    TimestampMustBeGreaterThanBefore: (u64, u64),
-}
+    DuplicatedSigner: (),
+    DuplicatedFeedId: (),
+}
diff --git a/src/core/processor.sw b/src/core/processor.sw
@@ -27,7 +27,6 @@ pub fn process_input(bytes: Bytes, config: Config) -> (Vec<u256>, u64) {
     let results = get_feed_values(matrix, config);
 
     config.validate_signer_count(results);
-
     (results.aggregated(), timestamp)
 }