From 19b1ec46886cf85be7f3d278d0e3a1ebb0272542 Mon Sep 17 00:00:00 2001
From: coolu <13291859621@163.com>
Date: Mon, 19 Nov 2018 15:44:57 +0800
Subject: [PATCH] Change Address to keys::Address, change TxSet interface
 (#109)

---
 cxrml/bridge/btc/src/lib.rs    | 6 +++---
 cxrml/bridge/btc/src/tx/mod.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cxrml/bridge/btc/src/lib.rs b/cxrml/bridge/btc/src/lib.rs
index e9c7ba00d48c5..f6155d6f8d04c 100644
--- a/cxrml/bridge/btc/src/lib.rs
+++ b/cxrml/bridge/btc/src/lib.rs
@@ -212,7 +212,7 @@ decl_storage! {
 
         // =====
         // tx
-        pub ReceiveAddress get(receive_address) config(): Option<Address>;
+        pub ReceiveAddress get(receive_address) config(): Option<keys::Address>;
         pub RedeemScript get(redeem_script) config(): Option<Vec<u8>>;
         pub CertAddress get(cert_address) config(): Option<keys::Address>;
         pub CertRedeemScript get(cert_redeem_script) config(): Option<Vec<u8>>;
@@ -221,10 +221,10 @@ decl_storage! {
         pub UTXOMaxIndex get(utxo_max_index) config(): u64;
         pub IrrBlock get(irr_block) config(): u32;
         pub BtcFee get(btc_fee) config(): u64;
-        pub TxSet get(tx_set): map H256 => Option<(T::AccountId, keys::Address, TxType, u64, BTCTransaction, H256)>; // Address, type, balance
+        pub TxSet get(tx_set): map H256 => Option<(T::AccountId, keys::Address, TxType, u64, H256, BTCTransaction)>; // Address, type, balance
         pub BlockTxids get(block_txids): map H256 => Vec<H256>;
         pub AddressMap get(address_map): map Address => Option<T::AccountId>;
-        pub AccountMap get(account_map): map T::AccountId => Option<Address>;
+        pub AccountMap get(account_map): map T::AccountId => Option<keys::Address>;
         pub TxProposal get(tx_proposal): Option<CandidateTx<T::AccountId>>;
         pub DepositCache get(deposit_cache): Option<Vec<(T::AccountId, u64, H256)>>; // account_id, amount, H256
 
diff --git a/cxrml/bridge/btc/src/tx/mod.rs b/cxrml/bridge/btc/src/tx/mod.rs
index e756d881bb38e..49998e9317d19 100644
--- a/cxrml/bridge/btc/src/tx/mod.rs
+++ b/cxrml/bridge/btc/src/tx/mod.rs
@@ -149,12 +149,12 @@ impl<T: Trait> TxStorage<T> {
         // todo 检查block是否存在
         <BlockTxids<T>>::mutate(block_hash.clone(), |v| v.push(hash.clone()));
 
-        <TxSet<T>>::insert(hash, (who.clone(), address, tx_type, balance, tx, block_hash));
+        <TxSet<T>>::insert(hash, (who.clone(), address, tx_type, balance, block_hash, tx));
     }
 
     fn find_tx(txid: &H256) -> Option<Transaction> {
         if let Some(tuple) = <TxSet<T>>::get(txid) {
-            return Some(tuple.4);
+            return Some(tuple.5);
         } else {
             return None;
         }
@@ -171,7 +171,7 @@ impl<T: Trait> RollBack<T> for TxStorage<T> {
 
         let txids = <BlockTxids<T>>::get(header);
         for txid in txids.iter() {
-            let (_, _, tx_type, _, tx, _,) = <TxSet<T>>::get(txid).unwrap();
+            let (_, _, tx_type, _, _, tx) = <TxSet<T>>::get(txid).unwrap();
             match tx_type {
                 TxType::Withdraw => {
                     let out_point_set = tx