cw20-escrow refactoring: Unify handling of native and cw20

contracts/cw20-atomic-swap/src/balance.rs

@@ -1,6 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use cosmwasm_std::Coin;
 use cw0::NativeBalance;
 use cw20::Cw20Coin;
 
@@ -33,3 +34,15 @@ impl Balance {
         }
     }
 }
+
+impl From<Vec<Coin>> for Balance {
+    fn from(coins: Vec<Coin>) -> Balance {
+        Balance::Native(NativeBalance(coins))
+    }
+}
+
+impl From<Cw20Coin> for Balance {
+    fn from(cw20_coin: Cw20Coin) -> Balance {
+        Balance::Cw20(cw20_coin)
+    }
+}

contracts/cw20-atomic-swap/src/contract.rs

@@ -4,7 +4,6 @@ use cosmwasm_std::{
     from_binary, log, to_binary, Api, BankMsg, Binary, CosmosMsg, Env, Extern, HandleResponse,
     HumanAddr, InitResponse, Querier, StdError, StdResult, Storage, WasmMsg,
 };
-use cw0::NativeBalance;
 use cw2::set_contract_version;
 use cw20::{Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
 
@@ -37,7 +36,7 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
     match msg {
         HandleMsg::Create(msg) => {
             let sent_funds = env.message.sent_funds.clone();
-            try_create(deps, env, msg, Balance::Native(NativeBalance(sent_funds)))
+            try_create(deps, env, msg, Balance::from(sent_funds))
         }
         HandleMsg::Release { id, preimage } => try_release(deps, env, id, preimage),
         HandleMsg::Refund { id } => try_refund(deps, env, id),
@@ -198,11 +197,11 @@ fn send_tokens<A: Api>(
         Ok(vec![])
     } else {
         match amount {
-            Balance::Native(NativeBalance(coins)) => {
+            Balance::Native(coins) => {
                 let msg = BankMsg::Send {
                     from_address: from.into(),
                     to_address: to.into(),
-                    amount: coins,
+                    amount: coins.into_vec(),
                 };
                 Ok(vec![msg.into()])
             }
@@ -240,7 +239,7 @@ fn query_details<S: Storage, A: Api, Q: Querier>(
 
     // Convert balance to human balance
     let balance_human = match swap.balance {
-        Balance::Native(coins) => BalanceHuman::Native(coins.0),
+        Balance::Native(coins) => BalanceHuman::Native(coins.into_vec()),
         Balance::Cw20(coin) => BalanceHuman::Cw20(Cw20CoinHuman {
             address: deps.api.human_address(&coin.address)?,
             amount: coin.amount,

contracts/cw20-escrow/Cargo.toml

@@ -18,6 +18,8 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cw20-atomic-swap = { path = "../cw20-atomic-swap", version = "0.2.1", default-features=false, features = ["library"] }
+cw0 = { path = "../../packages/cw0", version = "0.2.1" }
 cw2 = { path = "../../packages/cw2", version = "0.2.1" }
 cw20 = { path = "../../packages/cw20", version = "0.2.1" }
 cosmwasm-std = { version = "0.10.1", features = ["iterator"] }