0.6 asset remove is_native (paritytech#262)

* 0.6 asset remove is_native

Author: Aton

rpc/src/chainx/impl_rpc.rs

@@ -52,7 +52,6 @@ where
             .into_iter()
             .map(|(token, map)| AssetInfo {
                 name: String::from_utf8_lossy(&token).into_owned(),
-                is_native: true,
                 details: map,
             })
             .collect();
@@ -92,25 +91,8 @@ where
                 let free_issue = total_issue - other_total;
                 bmap.insert(xassets::AssetType::Free, free_issue);
             }
-            let mut trustee_addr = String::default();
-            if asset.token().as_slice() == xbitcoin::Module::<Runtime>::TOKEN {
-                let key = <xaccounts::TrusteeAddress<Runtime>>::key_for(xassets::Chain::Bitcoin);
-                match Self::pickout::<xaccounts::TrusteeAddressPair>(&state, &key)? {
-                    Some(a) => {
-                        let hot_address =
-                            Address::from_layout(&a.hot_address.as_slice()).unwrap_or_default();
-                        trustee_addr = hot_address.to_string()
-                    }
-                    None => Default::default(),
-                };
-            }
 
-            all_assets.push(TotalAssetInfo::new(
-                asset,
-                valid,
-                trustee_addr,
-                CodecBTreeMap(bmap),
-            ));
+            all_assets.push(TotalAssetInfo::new(asset, valid, CodecBTreeMap(bmap)));
         }
 
         into_pagedata(all_assets, page_index, page_size)

rpc/src/chainx/types.rs

@@ -14,7 +14,6 @@ pub struct PageData<T> {
 #[serde(rename_all = "camelCase")]
 pub struct AssetInfo {
     pub name: String,
-    pub is_native: bool,
     pub details: CodecBTreeMap<AssetType, Balance>,
 }
 
@@ -23,12 +22,10 @@ pub struct AssetInfo {
 pub struct TotalAssetInfo {
     name: String,
     token_name: String,
-    is_native: bool,
     chain: Chain,
     precision: u16,
     desc: String,
     online: bool,
-    trustee_addr: String,
     details: CodecBTreeMap<AssetType, Balance>,
 }
 
@@ -52,18 +49,15 @@ impl TotalAssetInfo {
     pub fn new(
         asset: Asset,
         online: bool,
-        trustee: String,
         details: CodecBTreeMap<AssetType, Balance>,
     ) -> TotalAssetInfo {
         TotalAssetInfo {
             name: String::from_utf8_lossy(&asset.token()).into_owned(),
             token_name: String::from_utf8_lossy(&asset.token_name()).into_owned(),
-            is_native: asset.chain() == Chain::ChainX,
             chain: asset.chain(),
             precision: asset.precision(),
             desc: String::from_utf8_lossy(&asset.desc()).into_owned(),
             online,
-            trustee_addr: trustee,
             details,
         }
     }