update contracts to use library

dancreee · Jan 4, 2021 · 8c2815b · 8c2815b
1 parent da9d34a
commit 8c2815b
Show file tree

Hide file tree

Showing 53 changed files with 1,922 additions and 2,430 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,7 +1,7 @@
-45d96bcf0777897f58688277745aa6abdf223de7536327be11e078856a7fdf79  mirror_collector.wasm
-c5ddf98b9b8db7822d6f25d42e7c20c6e2da24c9ab1207315f61777ed7b60b44  mirror_community.wasm
-0a7223b669479450064b3b392a12d094eae8c2eb6dd347d40c9553a397d8bc7c  mirror_factory.wasm
-35e60df303a1144982b9918637b72bae42b623bad522e5afc05c0f3674414e8f  mirror_gov.wasm
-5fff66c8925894f7703a2e70337960e7bdaf72677dcc1e036b0955696133ba5d  mirror_mint.wasm
-f620f81fb0abc814c05eecaccf8dfcfb62cd412eb694b2335ca840fd451dfc99  mirror_oracle.wasm
-94e1baf10ac1118ced1d712ce5a1dc0374e0f0f7da6af46b4490d38086e2718f  mirror_staking.wasm
+d9cbf57b2ce9221b318f54ff012dd7bdfd26b6af5c468302a89e7cd152174816  mirror_collector.wasm
+92499946f87230a43f4e0bca423928dd5891b0bba5b0010b86a2facddbebb598  mirror_community.wasm
+f98c52d2c071b589093928b5f6001fda3a36d3b4869304de2c37a54b2a491e6f  mirror_factory.wasm
+3efd7fa7bad89f289c42526bbb57020193977c5a42daa747a35d958eb5dcb150  mirror_gov.wasm
+1b94747aeeabe9eee7d2bd2638c94d55947cb0227f63eeec2056ce62388b6f12  mirror_mint.wasm
+ed765c2640c72728716cdb45568fd78f1f500bc7d3260bb6e478668a0961a6ca  mirror_oracle.wasm
+5ac59736362224ecc564cb49602233ee46c0293eed4fb9af828b1240e7f32189  mirror_staking.wasm
diff --git a/artifacts/mirror_collector.wasm b/artifacts/mirror_collector.wasm
diff --git a/artifacts/mirror_community.wasm b/artifacts/mirror_community.wasm
diff --git a/artifacts/mirror_factory.wasm b/artifacts/mirror_factory.wasm
diff --git a/artifacts/mirror_gov.wasm b/artifacts/mirror_gov.wasm
diff --git a/artifacts/mirror_mint.wasm b/artifacts/mirror_mint.wasm
diff --git a/artifacts/mirror_oracle.wasm b/artifacts/mirror_oracle.wasm
diff --git a/artifacts/mirror_staking.wasm b/artifacts/mirror_staking.wasm
diff --git a/contracts/mirror_collector/Cargo.toml b/contracts/mirror_collector/Cargo.toml
@@ -37,10 +37,11 @@ cranelift = ["cosmwasm-vm/default-cranelift"]
 singlepass = ["cosmwasm-vm/default-singlepass"]
 
 [dependencies]
-terraswap = "1.0.1"
 cw20 = "0.2"
 cosmwasm-std = { version = "0.10.1" }
 cosmwasm-storage = { version = "0.10.1" }
+mirror-protocol = { version = "1.0.0", path = "../../packages/mirror_protocol" }
+terraswap = "1.0.1"
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 

diff --git a/contracts/mirror_collector/examples/schema.rs b/contracts/mirror_collector/examples/schema.rs
@@ -2,7 +2,7 @@ use std::env::current_dir;
 use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
-use mirror_collector::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
+use mirror_protocol::collector::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();

diff --git a/contracts/mirror_collector/src/contract.rs b/contracts/mirror_collector/src/contract.rs
@@ -3,14 +3,12 @@ use cosmwasm_std::{
     HumanAddr, InitResponse, MigrateResponse, MigrateResult, Querier, StdResult, Storage, WasmMsg,
 };
 
-use crate::msg::{
-    ConfigResponse, HandleMsg, InitMsg, MigrateMsg, QueryMsg, TerraswapCw20HookMsg,
-    TerraswapHandleMsg,
-};
 use crate::state::{read_config, store_config, Config};
 
 use cw20::Cw20HandleMsg;
+use mirror_protocol::collector::{ConfigResponse, HandleMsg, InitMsg, MigrateMsg, QueryMsg};
 use terraswap::{query_balance, query_pair_info, query_token_balance, Asset, AssetInfo, PairInfo};
+use terraswap::{PairCw20HookMsg as TerraswapCw20HookMsg, PairHandleMsg as TerraswapHandleMsg};
 
 pub fn init<S: Storage, A: Api, Q: Querier>(
     deps: &mut Extern<S, A, Q>,
@@ -88,6 +86,8 @@ pub fn convert<S: Storage, A: Api, Q: Querier>(
                     ..swap_asset
                 },
                 max_spread: None,
+                belief_price: None,
+                to: None,
             })?,
             send: vec![Coin {
                 denom: config.base_denom,
@@ -103,7 +103,11 @@ pub fn convert<S: Storage, A: Api, Q: Querier>(
             msg: to_binary(&Cw20HandleMsg::Send {
                 contract: pair_info.contract_addr,
                 amount,
-                msg: Some(to_binary(&TerraswapCw20HookMsg::Swap { max_spread: None })?),
+                msg: Some(to_binary(&TerraswapCw20HookMsg::Swap {
+                    max_spread: None,
+                    belief_price: None,
+                    to: None,
+                })?),
             })?,
             send: vec![],
         })];

diff --git a/contracts/mirror_collector/src/lib.rs b/contracts/mirror_collector/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod contract;
-pub mod msg;
 pub mod state;
 
 #[cfg(test)]

diff --git a/contracts/mirror_collector/src/msg.rs b/contracts/mirror_collector/src/msg.rs
diff --git a/contracts/mirror_collector/src/state.rs b/contracts/mirror_collector/src/state.rs
@@ -9,7 +9,7 @@ static KEY_CONFIG: &[u8] = b"config";
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct Config {
     pub distribution_contract: CanonicalAddr, // collected rewards receiver
-    pub terraswap_factory: CanonicalAddr, // terraswap factory contract
+    pub terraswap_factory: CanonicalAddr,     // terraswap factory contract
     pub mirror_token: CanonicalAddr,
     pub base_denom: String,
 }

diff --git a/contracts/mirror_collector/src/testing.rs b/contracts/mirror_collector/src/testing.rs
@@ -1,10 +1,11 @@
 use crate::contract::{handle, init, query_config};
 use crate::mock_querier::mock_dependencies;
-use crate::msg::{ConfigResponse, HandleMsg, InitMsg, TerraswapCw20HookMsg, TerraswapHandleMsg};
 use cosmwasm_std::testing::{mock_env, MOCK_CONTRACT_ADDR};
 use cosmwasm_std::{to_binary, Coin, CosmosMsg, Decimal, HumanAddr, Uint128, WasmMsg};
 use cw20::Cw20HandleMsg;
+use mirror_protocol::collector::{ConfigResponse, HandleMsg, InitMsg};
 use terraswap::{Asset, AssetInfo};
+use terraswap::{PairCw20HookMsg as TerraswapCw20HookMsg, PairHandleMsg as TerraswapHandleMsg};
 
 #[test]
 fn proper_initialization() {
@@ -78,7 +79,14 @@ fn test_convert() {
             msg: to_binary(&Cw20HandleMsg::Send {
                 contract: HumanAddr::from("pairAPPL"),
                 amount: Uint128(100u128),
-                msg: Some(to_binary(&TerraswapCw20HookMsg::Swap { max_spread: None }).unwrap()),
+                msg: Some(
+                    to_binary(&TerraswapCw20HookMsg::Swap {
+                        max_spread: None,
+                        belief_price: None,
+                        to: None,
+                    })
+                    .unwrap()
+                ),
             })
             .unwrap(),
             send: vec![],
@@ -104,7 +112,9 @@ fn test_convert() {
                     },
                     amount: Uint128(99u128),
                 },
-                max_spread: None
+                max_spread: None,
+                belief_price: None,
+                to: None,
             })
             .unwrap(),
             send: vec![Coin {

diff --git a/contracts/mirror_collector/tests/integration.rs b/contracts/mirror_collector/tests/integration.rs
@@ -21,7 +21,7 @@ use cosmwasm_vm::testing::{
     init, mock_dependencies, mock_env, query, MockApi, MockQuerier, MockStorage,
 };
 use cosmwasm_vm::Instance;
-use mirror_collector::msg::{ConfigResponse, InitMsg, QueryMsg};
+use mirror_protocol::collector::{ConfigResponse, InitMsg, QueryMsg};
 
 // This line will test the output of cargo wasm
 static WASM: &[u8] =

diff --git a/contracts/mirror_community/Cargo.toml b/contracts/mirror_community/Cargo.toml
@@ -40,6 +40,7 @@ singlepass = ["cosmwasm-vm/default-singlepass"]
 cw20 = "0.2"
 cosmwasm-std = { version = "0.10.1" }
 cosmwasm-storage = { version = "0.10.1" }
+mirror-protocol = { version = "1.0.0", path = "../../packages/mirror_protocol" }
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 

diff --git a/contracts/mirror_community/examples/schema.rs b/contracts/mirror_community/examples/schema.rs
@@ -2,7 +2,7 @@ use std::env::current_dir;
 use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
-use mirror_community::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
+use mirror_protocol::community::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();

diff --git a/contracts/mirror_community/src/contract.rs b/contracts/mirror_community/src/contract.rs
@@ -1,10 +1,11 @@
+use crate::state::{read_config, store_config, Config};
+
 use cosmwasm_std::{
     log, to_binary, Api, Binary, CosmosMsg, Env, Extern, HandleResponse, HandleResult, HumanAddr,
     InitResponse, Querier, StdError, StdResult, Storage, Uint128, WasmMsg,
 };
 
-use crate::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
-use crate::state::{read_config, store_config, Config};
+use mirror_protocol::community::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
 
 use cw20::Cw20HandleMsg;
 

diff --git a/contracts/mirror_community/src/lib.rs b/contracts/mirror_community/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod contract;
-pub mod msg;
 pub mod state;
 
 #[cfg(test)]

diff --git a/contracts/mirror_community/src/msg.rs b/contracts/mirror_community/src/msg.rs
diff --git a/contracts/mirror_community/src/testing.rs b/contracts/mirror_community/src/testing.rs
@@ -1,8 +1,9 @@
 use crate::contract::{handle, init, query};
-use crate::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
+
 use cosmwasm_std::testing::{mock_dependencies, mock_env};
 use cosmwasm_std::{from_binary, to_binary, CosmosMsg, HumanAddr, StdError, Uint128, WasmMsg};
 use cw20::Cw20HandleMsg;
+use mirror_protocol::community::{ConfigResponse, HandleMsg, InitMsg, QueryMsg};
 
 #[test]
 fn proper_initialization() {

diff --git a/contracts/mirror_community/tests/integration.rs b/contracts/mirror_community/tests/integration.rs
@@ -21,7 +21,7 @@ use cosmwasm_vm::testing::{
     init, mock_dependencies, mock_env, query, MockApi, MockQuerier, MockStorage,
 };
 use cosmwasm_vm::Instance;
-use mirror_community::msg::{ConfigResponse, InitMsg, QueryMsg};
+use mirror_protocol::community::{ConfigResponse, InitMsg, QueryMsg};
 
 // This line will test the output of cargo wasm
 static WASM: &[u8] =

diff --git a/contracts/mirror_factory/Cargo.toml b/contracts/mirror_factory/Cargo.toml
@@ -37,10 +37,11 @@ cranelift = ["cosmwasm-vm/default-cranelift"]
 singlepass = ["cosmwasm-vm/default-singlepass"]
 
 [dependencies]
-terraswap = "1.0.1"
 cw20 = "0.2"
 cosmwasm-std = { version = "0.10.1", features = ["iterator"] }
 cosmwasm-storage = { version = "0.10.1", features = ["iterator"] }
+mirror-protocol = { version = "1.0.0", path = "../../packages/mirror_protocol" }
+terraswap = "1.0.1"
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 

diff --git a/contracts/mirror_factory/examples/schema.rs b/contracts/mirror_factory/examples/schema.rs
@@ -2,7 +2,9 @@ use std::env::current_dir;
 use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
-use mirror_factory::msg::{ConfigResponse, DistributionInfoResponse, HandleMsg, InitMsg, QueryMsg};
+use mirror_protocol::factory::{
+    ConfigResponse, DistributionInfoResponse, HandleMsg, InitMsg, QueryMsg,
+};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();