Просмотр исходного кода

Remove btc-related bool and db stuff

Janus 4 лет назад
Родитель
Сommit
aadedaf06b
3 измененных файлов с 7 добавлено и 13 удалено
  1. 1 9
      sql/cashier.sql
  2. 3 2
      src/service/btc.rs
  3. 3 2
      src/service/cashier.rs

+ 1 - 9
sql/cashier.sql

@@ -4,15 +4,7 @@ CREATE TABLE IF NOT EXISTS deposit_keypairs(
     coin_key_public BLOB NOT NULL,
 	asset_id BLOB NOT NULL
 );
-PRAGMA foreign_keys=on;
-CREATE TABLE IF NOT EXISTS btc_utxo(
-    tx_id BLOB PRIMARY KEY NOT NULL,
-    balance INTEGER NOT NULL,
-    btc_key_public BLOB NOT NULL,
-    FOREIGN KEY (btc_key_public)
-        REFERENCES deposit_keypairs (coin_key_public)
-        ON UPDATE CASCADE
-);
+
 CREATE TABLE IF NOT EXISTS withdraw_keypairs(
     coin_key_id BLOB PRIMARY KEY NOT NULL,
 	d_key_private BLOB NOT NULL,

+ 3 - 2
src/service/btc.rs

@@ -148,13 +148,13 @@ pub struct BtcClient {
 }
 
 impl BtcClient {
-    pub fn new( btc_endpoint: (bool, String) ) -> Result<Self> {
+    pub fn new( btc_endpoint: (Network, String) ) -> Result<Self> {
         let (network, client_address) = btc_endpoint;
         let client = ElectrumClient::new(&client_address)
             .map_err(|err| crate::Error::from(super::BtcFailed::from(err)))?;
         Ok(Self {
             client: Arc::new(client),
-            network: if network {Network::Testnet} else {Network::Bitcoin},
+            network: network,
         })
     }
 }
@@ -181,6 +181,7 @@ impl CoinClient for BtcClient {
 
     async fn send(&self, _address: Vec<u8>, _amount: u64) -> Result<()> {
         // TODO
+
         Ok(())
     }
 }

+ 3 - 2
src/service/cashier.rs

@@ -76,8 +76,9 @@ impl CashierService {
         cfg_if::cfg_if! {
             if #[cfg(feature = "default")]{
                 // TODO: the endpoint should be generic according to asset_id
-                let btc_endpoint: (bool, String) = 
-                    (true, String::from("ssl://blockstream.info:993"));
+                let btc_endpoint: (Network, String) =
+                    (bitcoin::network::constants::Network,
+                     String::from("ssl://blockstream.info:993"));
 
                 let btc_client = super::btc::BtcClient::new(btc_endpoint)?;
                 bridge.clone().add_clients(asset_id, Arc::new(btc_client)).await;