From 666f265a8bdc4c9c6d47c3094a5edfa320a91bc7 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Mon, 12 Oct 2020 18:05:35 +0200
Subject: [PATCH] Move shared Balance struct to cw20

---
 Cargo.lock                                                   | 1 -
 contracts/cw20-atomic-swap/src/contract.rs                   | 3 +--
 contracts/cw20-atomic-swap/src/lib.rs                        | 1 -
 contracts/cw20-atomic-swap/src/state.rs                      | 3 +--
 contracts/cw20-escrow/Cargo.toml                             | 1 -
 contracts/cw20-escrow/src/contract.rs                        | 3 +--
 contracts/cw20-escrow/src/state.rs                           | 3 +--
 {contracts/cw20-atomic-swap => packages/cw20}/src/balance.rs | 3 ++-
 packages/cw20/src/lib.rs                                     | 2 ++
 9 files changed, 8 insertions(+), 12 deletions(-)
 rename {contracts/cw20-atomic-swap => packages/cw20}/src/balance.rs (97%)

diff --git a/Cargo.lock b/Cargo.lock
index 8432c3dcf..c3e83f89e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -235,7 +235,6 @@ dependencies = [
  "cw0",
  "cw2",
  "cw20",
- "cw20-atomic-swap",
  "schemars",
  "serde",
  "thiserror",
diff --git a/contracts/cw20-atomic-swap/src/contract.rs b/contracts/cw20-atomic-swap/src/contract.rs
index c4659ff7e..773a8f2be 100644
--- a/contracts/cw20-atomic-swap/src/contract.rs
+++ b/contracts/cw20-atomic-swap/src/contract.rs
@@ -6,9 +6,8 @@ use sha2::{Digest, Sha256};
 
 use cw0::calc_range_start_string;
 use cw2::set_contract_version;
-use cw20::{Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
+use cw20::{Balance, Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
 
-use crate::balance::Balance;
 use crate::error::ContractError;
 use crate::msg::{
     is_valid_name, BalanceHuman, CreateMsg, DetailsResponse, HandleMsg, InitMsg, ListResponse,
diff --git a/contracts/cw20-atomic-swap/src/lib.rs b/contracts/cw20-atomic-swap/src/lib.rs
index 2b0b14f9c..33ecec4df 100644
--- a/contracts/cw20-atomic-swap/src/lib.rs
+++ b/contracts/cw20-atomic-swap/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod balance;
 pub mod contract;
 mod error;
 pub mod msg;
diff --git a/contracts/cw20-atomic-swap/src/state.rs b/contracts/cw20-atomic-swap/src/state.rs
index 61ebc914a..0b0d51615 100644
--- a/contracts/cw20-atomic-swap/src/state.rs
+++ b/contracts/cw20-atomic-swap/src/state.rs
@@ -1,12 +1,11 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::balance::Balance;
 use cosmwasm_std::{
     Binary, BlockInfo, CanonicalAddr, Order, ReadonlyStorage, StdError, StdResult, Storage,
 };
 use cosmwasm_storage::{bucket, bucket_read, prefixed_read, Bucket, ReadonlyBucket};
-use cw20::Expiration;
+use cw20::{Balance, Expiration};
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, Default)]
 pub struct AtomicSwap {
diff --git a/contracts/cw20-escrow/Cargo.toml b/contracts/cw20-escrow/Cargo.toml
index 140da9a30..b901e1cb1 100644
--- a/contracts/cw20-escrow/Cargo.toml
+++ b/contracts/cw20-escrow/Cargo.toml
@@ -18,7 +18,6 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cw20-atomic-swap = { path = "../cw20-atomic-swap", version = "0.2.3", default-features=false, features = ["library"] }
 cw0 = { path = "../../packages/cw0", version = "0.2.3" }
 cw2 = { path = "../../packages/cw2", version = "0.2.3" }
 cw20 = { path = "../../packages/cw20", version = "0.2.3" }
diff --git a/contracts/cw20-escrow/src/contract.rs b/contracts/cw20-escrow/src/contract.rs
index 52cf10fbc..7003b68ea 100644
--- a/contracts/cw20-escrow/src/contract.rs
+++ b/contracts/cw20-escrow/src/contract.rs
@@ -4,8 +4,7 @@ use cosmwasm_std::{
 };
 
 use cw2::set_contract_version;
-use cw20::{Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
-use cw20_atomic_swap::balance::Balance;
+use cw20::{Balance, Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
 
 use crate::error::ContractError;
 use crate::msg::{
diff --git a/contracts/cw20-escrow/src/state.rs b/contracts/cw20-escrow/src/state.rs
index 058391520..e9ff58917 100644
--- a/contracts/cw20-escrow/src/state.rs
+++ b/contracts/cw20-escrow/src/state.rs
@@ -6,8 +6,7 @@ use cosmwasm_std::{
 };
 use cosmwasm_storage::{bucket, bucket_read, prefixed_read, Bucket, ReadonlyBucket};
 
-use cw20::Cw20Coin;
-use cw20_atomic_swap::balance::Balance;
+use cw20::{Balance, Cw20Coin};
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, Default)]
 pub struct GenericBalance {
diff --git a/contracts/cw20-atomic-swap/src/balance.rs b/packages/cw20/src/balance.rs
similarity index 97%
rename from contracts/cw20-atomic-swap/src/balance.rs
rename to packages/cw20/src/balance.rs
index 0172707c8..ff68b1042 100644
--- a/contracts/cw20-atomic-swap/src/balance.rs
+++ b/packages/cw20/src/balance.rs
@@ -3,7 +3,8 @@ use serde::{Deserialize, Serialize};
 
 use cosmwasm_std::Coin;
 use cw0::NativeBalance;
-use cw20::Cw20Coin;
+
+use crate::Cw20Coin;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
diff --git a/packages/cw20/src/lib.rs b/packages/cw20/src/lib.rs
index 15ef7b103..e904f240e 100644
--- a/packages/cw20/src/lib.rs
+++ b/packages/cw20/src/lib.rs
@@ -1,3 +1,4 @@
+mod balance;
 mod coin;
 mod helpers;
 mod msg;
@@ -6,6 +7,7 @@ mod receiver;
 
 pub use cw0::Expiration;
 
+pub use crate::balance::Balance;
 pub use crate::coin::{Cw20Coin, Cw20CoinHuman};
 pub use crate::helpers::{Cw20CanonicalContract, Cw20Contract};
 pub use crate::msg::Cw20HandleMsg;