@@ -18,10 +18,7 @@ impl AssetsClient {
1818
1919 pub fn add_assets ( & self , assets : Vec < Asset > ) -> Result < usize , Box < dyn Error + Send + Sync > > {
2020 let assets = assets. into_iter ( ) . map ( |x| x. as_basic_primitive ( ) ) . collect ( ) ;
21- self . database
22- . assets ( ) ?
23- . add_assets ( assets)
24- . map_err ( |e| Box :: new ( e) as Box < dyn Error + Send + Sync > )
21+ self . database . assets ( ) ?. add_assets ( assets) . map_err ( |e| Box :: new ( e) as Box < dyn Error + Send + Sync > )
2522 }
2623
2724 #[ allow( unused) ]
@@ -37,20 +34,12 @@ impl AssetsClient {
3734 Ok ( self . database . assets ( ) ?. get_asset_full ( asset_id) ?)
3835 }
3936
40- pub fn get_assets_by_device_id (
41- & self ,
42- device_id : & str ,
43- wallet_index : i32 ,
44- from_timestamp : Option < u32 > ,
45- ) -> Result < Vec < AssetId > , Box < dyn Error + Send + Sync > > {
37+ pub fn get_assets_by_device_id ( & self , device_id : & str , wallet_index : i32 , from_timestamp : Option < u32 > ) -> Result < Vec < AssetId > , Box < dyn Error + Send + Sync > > {
4638 let subscriptions = self . database . subscriptions ( ) ?. get_subscriptions_by_device_id ( device_id, Some ( wallet_index) ) ?;
4739
4840 let chain_addresses = subscriptions. into_iter ( ) . map ( |x| ChainAddress :: new ( x. chain , x. address ) ) . collect ( ) ;
4941
50- Ok ( self
51- . database
52- . assets_addresses ( ) ?
53- . get_assets_by_addresses ( chain_addresses, from_timestamp, true ) ?)
42+ Ok ( self . database . assets_addresses ( ) ?. get_assets_by_addresses ( chain_addresses, from_timestamp, true ) ?)
5443 }
5544}
5645
@@ -68,14 +57,7 @@ impl SearchClient {
6857
6958 let assets: Vec < AssetDocument > = self
7059 . client
71- . search (
72- ASSETS_INDEX_NAME ,
73- & request. query ,
74- & build_filter ( filters) ,
75- [ ] . as_ref ( ) ,
76- request. limit ,
77- request. offset ,
78- )
60+ . search ( ASSETS_INDEX_NAME , & request. query , & build_filter ( filters) , [ ] . as_ref ( ) , request. limit , request. offset )
7961 . await ?;
8062
8163 Ok ( assets. into_iter ( ) . map ( |x| AssetBasic :: new ( x. asset , x. properties , x. score ) ) . collect ( ) )
@@ -84,14 +66,7 @@ impl SearchClient {
8466 pub async fn get_perpetuals_search ( & self , request : & SearchRequest ) -> Result < Vec < Perpetual > , Box < dyn Error + Send + Sync > > {
8567 let perpetuals: Vec < PerpetualDocument > = self
8668 . client
87- . search (
88- PERPETUALS_INDEX_NAME ,
89- & request. query ,
90- & build_filter ( vec ! [ ] ) ,
91- [ ] . as_ref ( ) ,
92- request. limit ,
93- request. offset ,
94- )
69+ . search ( PERPETUALS_INDEX_NAME , & request. query , & build_filter ( vec ! [ ] ) , [ ] . as_ref ( ) , request. limit , request. offset )
9570 . await ?;
9671
9772 Ok ( perpetuals. into_iter ( ) . map ( |x| x. perpetual ) . collect ( ) )
@@ -100,14 +75,7 @@ impl SearchClient {
10075 pub async fn get_nfts_search ( & self , request : & SearchRequest ) -> Result < Vec < NFTCollection > , Box < dyn Error + Send + Sync > > {
10176 let nfts: Vec < NFTDocument > = self
10277 . client
103- . search (
104- NFTS_INDEX_NAME ,
105- & request. query ,
106- & build_filter ( vec ! [ ] ) ,
107- [ ] . as_ref ( ) ,
108- request. limit ,
109- request. offset ,
110- )
78+ . search ( NFTS_INDEX_NAME , & request. query , & build_filter ( vec ! [ ] ) , [ ] . as_ref ( ) , request. limit , request. offset )
11179 . await ?;
11280
11381 Ok ( nfts. into_iter ( ) . map ( |x| x. collection ) . collect ( ) )
0 commit comments