rename scheduler to price-feed and move PriceKeeder to price-feed

Author: trinitys7

Cargo.lock

@@ -17,7 +17,7 @@ repository = "https://github.com/osmosis-labs/mesh-security"
 mesh-apis = { path = "./packages/apis" }
 mesh-bindings = { path = "./packages/bindings" }
 mesh-burn = { path = "./packages/burn" }
-mesh-scheduler = { path = "./packages/scheduler" }
+mesh-price-feed = { path = "./packages/price-feed" }
 mesh-sync = { path = "./packages/sync" }
 mesh-virtual-staking-mock = { path = "./packages/virtual-staking-mock" }
 

Cargo.toml

@@ -21,7 +21,7 @@ mt = ["library", "sylvia/mt"]
 
 [dependencies]
 mesh-apis        = { workspace = true }
-mesh-scheduler   = { workspace = true }
+mesh-price-feed  = { workspace = true }
 
 sylvia           = { workspace = true }
 cosmwasm-schema  = { workspace = true }

contracts/consumer/band-price-feed/Cargo.toml

@@ -7,14 +7,13 @@ use cw_utils::nonpayable;
 use mesh_apis::price_feed_api::{PriceFeedApi, PriceResponse};
 
 use crate::error::ContractError;
-use crate::price_keeper::PriceKeeper;
 use crate::state::{TradingPair, Config};
 
 use sylvia::types::{InstantiateCtx, QueryCtx, SudoCtx};
 use sylvia::{contract, schemars};
 
 use cw_band::{Input, OracleRequestPacketData};
-use mesh_scheduler::{Action, Scheduler};
+use mesh_price_feed::{Action, Scheduler, PriceKeeper};
 use obi::enc::OBIEncode;
 
 // Version info for migration
@@ -161,3 +160,48 @@ pub fn try_request(deps: DepsMut, env: &Env) -> Result<Response, ContractError>
         timeout: IbcTimeout::with_timestamp(env.block.time.plus_seconds(60)),
     }))
 }
+
+#[cfg(test)]
+mod tests {
+    use cosmwasm_std::{testing::{mock_dependencies, mock_env, mock_info}, Uint64, Uint128};
+
+    use super::*;
+
+    #[test]
+    fn instantiation() {
+        let mut deps = mock_dependencies();
+        let env = mock_env();
+        let info = mock_info("sender", &[]);
+        let contract = RemotePriceFeedContract::new();
+
+        let trading_pair = TradingPair {
+            base_asset: "base".to_string(),
+            quote_asset: "quote".to_string(),
+        };
+
+        contract
+            .instantiate(
+                InstantiateCtx {
+                    deps: deps.as_mut(),
+                    env,
+                    info,
+                },
+                trading_pair,
+                "07-tendermint-0".to_string(),
+                "connection-0".to_string(),
+                "channel-0".to_string(),
+                "transfer".to_string(),
+                Uint64::new(1),
+                Uint64::new(10),
+                Uint64::new(50),
+                vec![Coin { 
+                    denom: "uband".to_string(),
+                    amount: Uint128::new(1),
+                }],
+                Uint64::new(100000),
+                Uint64::new(200000),
+                1
+            )
+            .unwrap();
+    }
+}

contracts/consumer/band-price-feed/src/contract.rs

@@ -3,7 +3,7 @@ use cw_utils::PaymentError;
 use mesh_apis::ibc::VersionError;
 use thiserror::Error;
 
-use crate::price_keeper::PriceKeeperError;
+use mesh_price_feed::PriceKeeperError;
 
 /// Never is a placeholder to ensure we don't return any errors
 #[derive(Error, Debug)]

contracts/consumer/band-price-feed/src/error.rs

@@ -1,5 +1,4 @@
 pub mod contract;
 pub mod error;
 pub mod state;
-pub mod price_keeper;
 pub mod ibc;

contracts/consumer/band-price-feed/src/lib.rs

@@ -1,6 +1,5 @@
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Decimal, IbcEndpoint, Timestamp};
-use cosmwasm_std::{Coin, Uint64};
+use cosmwasm_std::{Coin, Uint64, IbcEndpoint};
 
 #[cw_serde]
 pub struct Config {
@@ -31,9 +30,3 @@ pub struct TradingPair {
     pub base_asset: String,
     pub quote_asset: String,
 }
-
-#[cw_serde]
-pub struct PriceInfo {
-    pub time: Timestamp,
-    pub native_per_foreign: Decimal,
-}

contracts/consumer/band-price-feed/src/main.rs

@@ -19,7 +19,7 @@ mt = ["library", "sylvia/mt"]
 
 [dependencies]
 mesh-apis        = { workspace = true }
-mesh-scheduler   = { workspace = true }
+mesh-price-feed  = { workspace = true }
 
 sylvia           = { workspace = true }
 cosmwasm-schema  = { workspace = true }

contracts/consumer/band-price-feed/src/state.rs

@@ -10,8 +10,7 @@ use mesh_apis::price_feed_api::{self, PriceFeedApi, PriceResponse};
 use crate::error::ContractError;
 use crate::ibc::{make_ibc_packet, AUTH_ENDPOINT};
 use crate::msg::AuthorizedEndpoint;
-use crate::price_keeper::PriceKeeper;
-use mesh_scheduler::{Action, Scheduler};
+use mesh_price_feed::{Action, Scheduler, PriceKeeper};
 use crate::state::TradingPair;
 
 pub const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");

contracts/consumer/osmosis-price-feed/Cargo.toml

@@ -3,7 +3,7 @@ use cw_utils::PaymentError;
 use mesh_apis::ibc::VersionError;
 use thiserror::Error;
 
-use crate::price_keeper::PriceKeeperError;
+use mesh_price_feed::PriceKeeperError;
 
 #[derive(Error, Debug)]
 pub enum ContractError {

contracts/consumer/osmosis-price-feed/src/contract.rs

@@ -2,5 +2,4 @@ pub mod contract;
 pub mod error;
 pub mod ibc;
 pub mod msg;
-pub mod price_keeper;
 pub mod state;

contracts/consumer/osmosis-price-feed/src/error.rs

@@ -1,15 +1,8 @@
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Decimal, Timestamp};
 
 #[cw_serde]
 pub struct TradingPair {
     pub pool_id: u64,
     pub base_asset: String,
     pub quote_asset: String,
 }
-
-#[cw_serde]
-pub struct PriceInfo {
-    pub time: Timestamp,
-    pub native_per_foreign: Decimal,
-}

contracts/consumer/osmosis-price-feed/src/lib.rs

@@ -1,9 +1,11 @@
 [package]
-name = "mesh-scheduler"
+name = "mesh-price-feed"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
+cosmwasm-schema  = { workspace = true }
 cosmwasm-std     = { workspace = true }
-cw-storage-plus  = { workspace = true }
+cw-storage-plus  = { workspace = true }
+thiserror        = { workspace = true }

contracts/consumer/osmosis-price-feed/src/price_keeper.rs

@@ -0,0 +1,5 @@
+mod scheduler;
+mod price_keeper;
+
+pub use scheduler::{Action, Scheduler};
+pub use price_keeper::{PriceKeeper, PriceKeeperError};

contracts/consumer/osmosis-price-feed/src/state.rs

@@ -1,7 +1,12 @@
+use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Decimal, Deps, DepsMut, Env, Timestamp};
 use cw_storage_plus::Item;
 
-use crate::state::PriceInfo;
+#[cw_serde]
+pub struct PriceInfo {
+    pub time: Timestamp,
+    pub native_per_foreign: Decimal,
+}
 
 /// A component that keeps track of the latest price info.
 pub struct PriceKeeper {