refactored fadroma update

contracts/governance/Cargo.toml

@@ -46,6 +46,5 @@ serde_json = { version = "1.0.67" }
 mockall = "0.10.2"
 mockall_double = "0.2.0"
 fadroma = { branch = "v100", git = "https://github.com/hackbg/fadroma.git", features= ["ensemble"]  }
-fadroma-platform-scrt = { branch = "v100",  git = "https://github.com/hackbg/fadroma.git" }
 contract_harness = { version = "0.1.0", path = "../../packages/contract_harness", features = [ "governance", "snip20_staking", "snip20"  ] }
 spip_stkd_0 = { version = "0.1.0", path = "../snip20_staking" }

contracts/governance/src/tests/handle/mod.rs

@@ -8,7 +8,7 @@ use crate::tests::{admin_only_governance, get_config};
 use contract_harness::harness::snip20::Snip20;
 use cosmwasm_std::HumanAddr;
 use fadroma::ensemble::MockEnv;
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::{contract_interfaces::{governance, snip20}, utils::asset::Contract};
 
 #[test]

contracts/governance/src/tests/handle/proposal/assembly_voting.rs

@@ -10,7 +10,7 @@ use contract_harness::harness::{governance::Governance, snip20_staking::Snip20St
 use cosmwasm_math_compat::Uint128;
 use cosmwasm_std::{to_binary, Binary, HumanAddr, StdResult};
 use fadroma::ensemble::{ContractEnsemble, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::{
     contract_interfaces::{
         governance,

contracts/governance/src/tests/handle/proposal/funding.rs

@@ -10,7 +10,7 @@ use contract_harness::harness::{governance::Governance, snip20::Snip20};
 use cosmwasm_math_compat::Uint128;
 use cosmwasm_std::{to_binary, Binary, HumanAddr, StdResult};
 use fadroma::ensemble::{ContractEnsemble, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::{
     contract_interfaces::{
         governance,

contracts/governance/src/tests/handle/proposal/mod.rs

@@ -13,7 +13,7 @@ use crate::tests::{
 use cosmwasm_math_compat::Uint128;
 use cosmwasm_std::{to_binary, Binary, HumanAddr, StdResult};
 use fadroma::ensemble::{ContractEnsemble, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::{
     contract_interfaces::{
         governance,

contracts/governance/src/tests/handle/proposal/voting.rs

@@ -7,7 +7,7 @@ use contract_harness::harness::{
 use cosmwasm_math_compat::Uint128;
 use cosmwasm_std::{to_binary, HumanAddr, StdResult};
 use fadroma::ensemble::{ContractEnsemble, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::{
     contract_interfaces::{
         governance,

contracts/governance/src/tests/mod.rs

@@ -15,8 +15,8 @@ use cosmwasm_std::{
     StdError,
     StdResult,
 };
+use fadroma::core::ContractLink;
 use fadroma::ensemble::{ContractEnsemble, ContractHarness, MockDeps, MockEnv};
-use fadroma_platform_scrt::ContractLink;
 use serde::Serialize;
 use shade_protocol::contract_interfaces::{
     governance,

contracts/mint/tests/integration.rs

@@ -45,7 +45,7 @@ use contract_harness::harness::{
 use fadroma::{
     ensemble::{ContractEnsemble, ContractHarness, MockDeps, MockEnv},
 };
-use fadroma::scrt::ContractLink;
+use fadroma::core::ContractLink;
 
 fn test_ensemble(
     offer_price: Uint128,

contracts/query_auth/Cargo.toml

@@ -43,4 +43,3 @@ contract_harness = { version = "0.1.0", path = "../../packages/contract_harness"
 mockall = "0.10.2"
 mockall_double = "0.2.0"
 fadroma = { branch = "v100", git = "https://github.com/hackbg/fadroma.git", features= ["ensemble"] }
-fadroma-platform-scrt = { branch = "v100",  git = "https://github.com/hackbg/fadroma.git" }

contracts/query_auth/src/tests/mod.rs

@@ -8,7 +8,7 @@ use cosmwasm_std::{
     StdResult,
 };
 use fadroma::ensemble::{ContractEnsemble, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use query_authentication::transaction::{PermitSignature, PubKey};
 use shade_protocol::contract_interfaces::{
     query_auth::{self, PermitData, QueryPermit},

contracts/snip20/Cargo.toml

@@ -44,5 +44,4 @@ snafu = { version = "0.6.3" }
 contract_harness = { version = "0.1.0", path = "../../packages/contract_harness", features = [ "snip20" ] }
 mockall = "0.10.2"
 mockall_double = "0.2.0"
-fadroma = { branch = "v100", git = "https://github.com/hackbg/fadroma.git", features= ["ensemble"] }
-fadroma-platform-scrt = { branch = "v100",  git = "https://github.com/hackbg/fadroma.git" }
+fadroma = { branch = "v100", git = "https://github.com/hackbg/fadroma.git", features= ["ensemble"] }

contracts/snip20/src/query.rs

@@ -109,7 +109,7 @@ pub fn balance<S: Storage, A: Api, Q: Querier>(
     account: HumanAddr,
 ) -> StdResult<QueryAnswer> {
     Ok(QueryAnswer::Balance {
-        amount: Balance::load(&deps.storage, account)?.0,
+        amount: Balance::may_load(&deps.storage, account)?.unwrap_or(Balance(Uint128::zero())).0,
     })
 }
 

contracts/snip20/src/tests/mod.rs

@@ -4,7 +4,7 @@ pub mod query;
 use contract_harness::harness::snip20::Snip20;
 use cosmwasm_std::{Binary, HumanAddr, StdResult};
 use fadroma::ensemble::{ContractEnsemble, ContractHarness, MockDeps, MockEnv};
-use fadroma_platform_scrt::ContractLink;
+use fadroma::core::ContractLink;
 use shade_protocol::contract_interfaces::{
     snip20,
     snip20::{InitConfig, InitialBalance},

contracts/treasury/tests/integration.rs

@@ -30,7 +30,7 @@ use contract_harness::harness::{
 };
 
 use fadroma::{
-    scrt::ContractLink,
+    core::ContractLink,
     ensemble::{
        MockEnv, MockDeps, 
        ContractHarness, ContractEnsemble,

contracts/treasury_manager/tests/integration.rs

@@ -28,7 +28,7 @@ use contract_harness::harness::{
 };
 
 use fadroma::{
-    scrt::{
+    core::{
         ContractLink,
     },
     ensemble::{