Merge pull request #120 from LNP-BP/i9n/import-list

I9n/import list

Author: dr-orlovsky

src/contracts/fungible/data/invoice.rs

@@ -52,6 +52,11 @@ pub enum OutpointDescriptor {
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
+#[cfg_attr(
+    feature = "serde",
+    derive(Serialize, Deserialize,),
+    serde(crate = "serde_crate")
+)]
 pub enum Outpoint {
     BlindedUtxo(OutpointHash),
     Address(bitcoin::Address),

src/contracts/fungible/runtime.rs

@@ -318,7 +318,7 @@ impl Runtime {
     ) -> Result<Reply, ServiceErrorDomain> {
         debug!("Got SYNC");
         let data = self.cacher.export(Some(data_format))?;
-        Ok(Reply::Sync(reply::SyncFormat(self.config.format, data)))
+        Ok(Reply::Sync(reply::SyncFormat(data_format, data)))
     }
 
     async fn rpc_assets(

src/i9n/fungible.rs

@@ -23,7 +23,9 @@ use lnpbp::bp;
 use lnpbp::bp::psbt::ProprietaryKeyMap;
 use lnpbp::lnp::presentation::Encode;
 use lnpbp::lnp::{Session, Unmarshall};
-use lnpbp::rgb::{AtomicValue, Consignment, ContractId, PSBT_OUT_PUBKEY};
+use lnpbp::rgb::{
+    AtomicValue, Consignment, ContractId, Genesis, PSBT_OUT_PUBKEY,
+};
 
 use super::{Error, Runtime};
 use crate::api::{
@@ -141,7 +143,7 @@ impl Runtime {
                 let out_file = File::create(&transaction_file)
                     .expect("can't create output transaction file");
                 transfer.psbt.consensus_encode(out_file)?;
-                println!(
+                info!(
                     "Transfer succeeded, consignment data are written to {:?}, partially signed witness transaction to {:?}",
                     consignment_file, transaction_file
                 );
@@ -165,8 +167,7 @@ impl Runtime {
         match &*self.command(Request::Accept(api))? {
             Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
             Reply::Success => {
-                println!("Accept succeeded");
-
+                info!("Accept command succeeded");
                 Ok(())
             }
             _ => Err(Error::UnexpectedResponse),
@@ -177,8 +178,7 @@ impl Runtime {
         match &*self.command(Request::Validate(consignment))? {
             Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
             Reply::Success => {
-                println!("Validate succeeded");
-
+                info!("Validation succeeded");
                 Ok(())
             }
             _ => Err(Error::UnexpectedResponse),
@@ -191,11 +191,7 @@ impl Runtime {
     ) -> Result<BTreeMap<OutPoint, Vec<AtomicValue>>, Error> {
         match &*self.command(Request::Allocations(contract_id))? {
             Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
-            Reply::Allocations(response) => {
-                println!("Asset allocations succeeded");
-
-                Ok(response.clone())
-            }
+            Reply::Allocations(response) => Ok(response.clone()),
             _ => Err(Error::UnexpectedResponse),
         }
     }
@@ -206,22 +202,40 @@ impl Runtime {
     ) -> Result<BTreeMap<ContractId, Vec<AtomicValue>>, Error> {
         match &*self.command(Request::Assets(outpoint))? {
             Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
-            Reply::Assets(response) => {
-                println!("Outpoint assets succeeded");
+            Reply::Assets(response) => Ok(response.clone()),
+            _ => Err(Error::UnexpectedResponse),
+        }
+    }
 
-                Ok(response.clone())
+    pub fn export_asset(
+        &mut self,
+        asset_id: ContractId,
+    ) -> Result<Genesis, Error> {
+        match &*self.command(Request::ExportAsset(asset_id))? {
+            Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
+            Reply::Genesis(response) => Ok(response.clone()),
+            _ => Err(Error::UnexpectedResponse),
+        }
+    }
+
+    pub fn import_asset(&mut self, genesis: Genesis) -> Result<(), Error> {
+        match &*self.command(Request::ImportAsset(genesis))? {
+            Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
+            Reply::Success => {
+                info!("Asset import succeeded");
+                Ok(())
             }
             _ => Err(Error::UnexpectedResponse),
         }
     }
 
-    pub fn sync(
+    pub fn list_assets(
         &mut self,
         data_format: DataFormat,
     ) -> Result<reply::SyncFormat, Error> {
         match &*self.command(Request::Sync(data_format))? {
-            Reply::Sync(data) => Ok(data.clone()),
-            Reply::Failure(failmsg) => Err(Error::Reply(failmsg.clone())),
+            Reply::Failure(failure) => Err(Error::Reply(failure.clone())),
+            Reply::Sync(response) => Ok(response.clone()),
             _ => Err(Error::UnexpectedResponse),
         }
     }