Fix/add position bug

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sommelier_steward"
-version = "3.3.0"
+version = "3.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

steward/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "steward"
 authors = []
-version = "3.3.0"
+version = "3.3.1"
 edition = "2018"
 
 [dependencies]

steward/src/cellars.rs

@@ -17,8 +17,6 @@ pub(crate) mod cellar_v2_2;
 
 // allow/block lists.
 
-pub const ALLOWED_ADD_POSITION: [(&str, u32); 3] =
-    [(CELLAR_RYUSD, 25), (CELLAR_RYUSD, 26), (CELLAR_RYUSD, 27)];
 pub const ALLOWED_CATALOGUE_ADAPTORS: [(&str, &str); 6] = [
     (CELLAR_RYETH, ADAPTOR_MORPHO_AAVE_V2_A_TOKEN_V1),
     (CELLAR_RYETH, ADAPTOR_MORPHO_AAVE_V2_DEBT_TOKEN_V1),
@@ -110,18 +108,6 @@ pub fn check_blocked_position(position: &u32) -> Result<(), Error> {
     Ok(())
 }
 
-pub fn validate_add_position(cellar_id: &str, position: u32) -> Result<(), Error> {
-    check_blocked_position(&position)?;
-    let cellar_id = normalize_address(cellar_id.to_string());
-    if !ALLOWED_ADD_POSITION.contains(&(&cellar_id, position)) {
-        return Err(sp_call_error(format!(
-            "position {position} not allowed to be added for {cellar_id}"
-        )));
-    }
-
-    Ok(())
-}
-
 pub fn validate_add_adaptor_to_catalogue(cellar_id: &str, adaptor_id: &str) -> Result<(), Error> {
     let adaptor_id = normalize_address(adaptor_id.to_string());
     check_blocked_adaptor(&adaptor_id)?;
@@ -243,37 +229,6 @@ mod tests {
         assert_eq!(expected_err, res.unwrap_err().to_string());
     }
 
-    #[test]
-    fn test_validate_add_position() {
-        // allows approved cellar/position ID pairs
-        let (cellar_id, approved_pos) = (CELLAR_RYUSD, 25);
-        assert!(validate_add_position(cellar_id, approved_pos).is_ok());
-
-        let error_prefix = "SP call error: ".to_string();
-
-        // rejects blocked position ID
-        let blocked_pos = 4;
-        let res = validate_add_position(cellar_id, blocked_pos);
-        let expected_err = error_prefix.clone() + &format!("position {blocked_pos} is blocked");
-        assert!(res.is_err());
-        assert_eq!(expected_err, res.unwrap_err().to_string());
-
-        // rejects unapproved cellar/position ID pair
-        let unapproved_pos = 20;
-        let res = validate_add_position(cellar_id, unapproved_pos);
-        let expected_err = error_prefix.clone()
-            + &format!("position {unapproved_pos} not allowed to be added for {cellar_id}");
-        assert!(res.is_err());
-        assert_eq!(expected_err, res.unwrap_err().to_string());
-
-        let unapproved_cellar = "0000000000000000000000000000000000000000";
-        let res = validate_add_position(unapproved_cellar, approved_pos);
-        let expected_err = error_prefix
-            + &format!("position {approved_pos} not allowed to be added for {unapproved_cellar}");
-        assert!(res.is_err());
-        assert_eq!(expected_err, res.unwrap_err().to_string());
-    }
-
     #[test]
     fn test_validate_add_adaptor_to_catalogue() {
         // allows approved cellar/adaptor ID pairs

steward/src/cellars/cellar_v2.rs

@@ -16,7 +16,7 @@ use crate::{
 };
 
 use super::{
-    check_blocked_adaptor, log_cellar_call, normalize_address, validate_add_position,
+    check_blocked_adaptor, check_blocked_position, log_cellar_call, normalize_address,
     validate_setup_adaptor,
 };
 
@@ -26,7 +26,7 @@ const CELLAR_NAME: &str = "CellarV2";
 pub fn get_encoded_call(function: StrategyFunction, cellar_id: String) -> Result<Vec<u8>, Error> {
     match function {
         AddPosition(params) => {
-            validate_add_position(&cellar_id, params.position_id)?;
+            check_blocked_position(&params.position_id)?;
             log_cellar_call(CELLAR_NAME, &AddPositionCall::function_name(), &cellar_id);
 
             let call = AddPositionCall {

steward/src/cellars/cellar_v2_2.rs

@@ -21,8 +21,8 @@ use crate::{
 };
 
 use super::{
-    check_blocked_adaptor, log_cellar_call, validate_add_adaptor_to_catalogue,
-    validate_add_position, validate_add_position_to_catalogue,
+    check_blocked_adaptor, check_blocked_position, log_cellar_call,
+    validate_add_adaptor_to_catalogue, validate_add_position_to_catalogue,
 };
 
 const CELLAR_NAME: &str = "CellarV2.2";
@@ -51,7 +51,7 @@ pub fn get_encoded_function(call: FunctionCall, cellar_id: String) -> Result<Vec
         .ok_or_else(|| sp_call_error("call data is empty".to_string()))?;
     match function {
         Function::AddPosition(params) => {
-            validate_add_position(&cellar_id, params.position_id)?;
+            check_blocked_position(&params.position_id)?;
             log_cellar_call(CELLAR_NAME, &AddPositionCall::function_name(), &cellar_id);
 
             let call = AddPositionCall {

steward_abi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "steward_abi"
-version = "3.3.0"
+version = "3.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

steward_proto_rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "steward_proto"
-version = "3.3.0"
+version = "3.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html