Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

Commit 10a6e99

Browse files
EthanYuanEthanYuan
committed
Refactor code based on review suggestions
1 parent 51f4a05 commit 10a6e99

File tree

10 files changed

+102
-113
lines changed

10 files changed

+102
-113
lines changed

‎common/src/lib.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ impl PaginationRequest {
197197
return_count: bool,
198198
) -> PaginationRequest {
199199
PaginationRequest {
200-
cursor: cursor.map(Into::into),
200+
cursor,
201201
order,
202-
limit: limit.map(Into::into),
203-
skip: skip.map(Into::into),
202+
limit,
203+
skip,
204204
return_count,
205205
}
206206
}
@@ -220,11 +220,11 @@ impl PaginationRequest {
220220
}
221221

222222
pub fn set_limit(&mut self, limit: Option<u64>) {
223-
self.limit = limit.map(Into::into);
223+
self.limit = limit;
224224
}
225225

226226
pub fn update_by_response(&mut self, next_cursor: Option<u64>) {
227-
self.cursor = next_cursor.map(Into::into);
227+
self.cursor = next_cursor;
228228
}
229229
}
230230

‎core/rpc/core/src/impl.rs

+19-21
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@ mod query;
55
pub(crate) mod utils;
66
pub(crate) mod utils_types;
77

8-
use core_ckb_client::CkbRpc;
9-
use core_rpc_types::{
10-
indexer, AdjustAccountPayload, BlockInfo, DaoClaimPayload, DaoDepositPayload,
11-
DaoWithdrawPayload, GetAccountInfoPayload, GetAccountInfoResponse, GetBalancePayload,
12-
GetBalanceResponse, GetBlockInfoPayload, GetSpentTransactionPayload,
13-
GetTransactionInfoResponse, MercuryInfo, PaginationResponse, QueryTransactionsPayload,
14-
SimpleTransferPayload, SudtIssuePayload, SyncState, TransactionCompletionResponse,
15-
TransferPayload, TxView,
16-
};
17-
188
use crate::r#impl::build_tx::calculate_tx_size;
199
use crate::{error::CoreError, MercuryRpcServer, RpcResult};
2010

11+
use ckb_jsonrpc_types::Uint64;
12+
use ckb_types::core::RationalU256;
13+
use ckb_types::{packed, prelude::*, H160, H256};
14+
use clap::crate_version;
2115
use common::lazy::{
2216
ACP_CODE_HASH, CHEQUE_CODE_HASH, DAO_CODE_HASH, PW_LOCK_CODE_HASH, SECP256K1_CODE_HASH,
2317
SUDT_CODE_HASH,
@@ -27,13 +21,17 @@ use common::{
2721
async_trait, hash::blake2b_160, Address, AddressPayload, Context, NetworkType, ACP, CHEQUE,
2822
DAO, PW_LOCK, SECP256K1, SUDT,
2923
};
24+
use core_ckb_client::CkbRpc;
3025
use core_rpc_types::error::MercuryRpcError;
26+
use core_rpc_types::{
27+
indexer, AdjustAccountPayload, BlockInfo, DaoClaimPayload, DaoDepositPayload,
28+
DaoWithdrawPayload, GetAccountInfoPayload, GetAccountInfoResponse, GetBalancePayload,
29+
GetBalanceResponse, GetBlockInfoPayload, GetSpentTransactionPayload,
30+
GetTransactionInfoResponse, MercuryInfo, PaginationResponse, QueryTransactionsPayload,
31+
SimpleTransferPayload, SudtIssuePayload, SyncState, TransactionCompletionResponse,
32+
TransferPayload, TxView,
33+
};
3134
use core_storage::{DBInfo, RelationalStorage};
32-
33-
use ckb_jsonrpc_types::Uint64;
34-
use ckb_types::core::RationalU256;
35-
use ckb_types::{packed, prelude::*, H160, H256};
36-
use clap::crate_version;
3735
use jsonrpsee_http_server::types::Error;
3836
use parking_lot::RwLock;
3937
use pprof::ProfilerGuard;
@@ -195,7 +193,7 @@ impl<C: CkbRpc> MercuryRpcServer for MercuryRpcImpl<C> {
195193
Context::new(),
196194
search_key,
197195
order,
198-
limit,
196+
limit.into(),
199197
after_cursor.map(Into::into),
200198
)
201199
.await
@@ -222,7 +220,7 @@ impl<C: CkbRpc> MercuryRpcServer for MercuryRpcImpl<C> {
222220
Context::new(),
223221
search_key,
224222
order,
225-
limit,
223+
limit.into(),
226224
after_cursor.map(Into::into),
227225
)
228226
.await
@@ -251,8 +249,8 @@ impl<C: CkbRpc> MercuryRpcServer for MercuryRpcImpl<C> {
251249
self.inner_get_live_cells_by_lock_hash(
252250
Context::new(),
253251
lock_hash,
254-
page,
255-
per_page,
252+
page.into(),
253+
per_page.into(),
256254
reverse_order,
257255
)
258256
.await
@@ -278,8 +276,8 @@ impl<C: CkbRpc> MercuryRpcServer for MercuryRpcImpl<C> {
278276
self.inner_get_transactions_by_lock_hash(
279277
Context::new(),
280278
lock_hash,
281-
page,
282-
per_page,
279+
page.into(),
280+
per_page.into(),
283281
reverse_order,
284282
)
285283
.await

‎core/rpc/core/src/impl/adjust_account.rs

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
use crate::r#impl::{calculate_tx_size, utils, utils_types};
22
use crate::{error::CoreError, InnerResult, MercuryRpcImpl};
33

4+
use ckb_types::core::TransactionView;
5+
use ckb_types::{bytes::Bytes, packed, prelude::*};
46
use common::address::{is_acp, is_pw_lock};
7+
use common::hash::blake2b_256_to_160;
58
use common::lazy::{ACP_CODE_HASH, PW_LOCK_CODE_HASH, SECP256K1_CODE_HASH};
9+
use common::utils::decode_udt_amount;
10+
use common::{Context, DetailedCell, PaginationRequest, ACP, PW_LOCK, SECP256K1, SUDT};
11+
use common_logger::tracing_async;
612
use core_ckb_client::CkbRpc;
713
use core_rpc_types::consts::{ckb, DEFAULT_FEE_RATE, STANDARD_SUDT_CAPACITY};
814
use core_rpc_types::{
915
AccountType, AdjustAccountPayload, AssetType, GetAccountInfoPayload, GetAccountInfoResponse,
1016
HashAlgorithm, Item, JsonItem, SignAlgorithm, SignatureAction, TransactionCompletionResponse,
1117
};
12-
13-
use common::hash::blake2b_256_to_160;
14-
use common::utils::decode_udt_amount;
15-
use common::{Context, DetailedCell, ACP, PW_LOCK, SECP256K1, SUDT};
16-
use common_logger::tracing_async;
17-
18-
use ckb_types::core::TransactionView;
19-
use ckb_types::{bytes::Bytes, packed, prelude::*};
2018
use num_traits::Zero;
2119

2220
use std::collections::{HashMap, HashSet};
@@ -59,7 +57,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
5957
None,
6058
lock_filter,
6159
None,
62-
&mut common::PaginationRequest::default(),
60+
&mut PaginationRequest::default(),
6361
)
6462
.await?;
6563
let live_acps_len = live_acps.len();
@@ -310,7 +308,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
310308
None,
311309
lock_filter,
312310
None,
313-
&mut common::PaginationRequest::default(),
311+
&mut PaginationRequest::default(),
314312
)
315313
.await?;
316314

‎core/rpc/core/src/impl/build_tx.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
use crate::r#impl::{address_to_script, utils, utils_types};
22
use crate::{error::CoreError, InnerResult, MercuryRpcImpl};
33

4+
use ckb_jsonrpc_types::TransactionView as JsonTransactionView;
5+
use ckb_types::core::{
6+
EpochNumberWithFraction, ScriptHashType, TransactionBuilder, TransactionView,
7+
};
8+
use ckb_types::{bytes::Bytes, constants::TX_VERSION, packed, prelude::*, H160, H256, U256};
49
use common::address::{is_acp, is_pw_lock, is_secp256k1};
510
use common::hash::blake2b_256_to_160;
611
use common::lazy::{ACP_CODE_HASH, DAO_CODE_HASH, PW_LOCK_CODE_HASH, SECP256K1_CODE_HASH};
712
use common::utils::decode_udt_amount;
8-
use common::{Address, Context, DetailedCell, ACP, CHEQUE, DAO, PW_LOCK, SECP256K1, SUDT};
9-
use core_rpc_types::lazy::CURRENT_EPOCH_NUMBER;
10-
13+
use common::{
14+
Address, Context, DetailedCell, PaginationRequest, ACP, CHEQUE, DAO, PW_LOCK, SECP256K1, SUDT,
15+
};
1116
use common_logger::tracing_async;
1217
use core_ckb_client::CkbRpc;
1318
use core_rpc_types::consts::{
1419
BYTE_SHANNONS, CHEQUE_CELL_CAPACITY, DEFAULT_FEE_RATE, INIT_ESTIMATE_FEE, MAX_ITEM_NUM,
1520
MIN_CKB_CAPACITY, MIN_DAO_CAPACITY, STANDARD_SUDT_CAPACITY,
1621
};
22+
use core_rpc_types::lazy::CURRENT_EPOCH_NUMBER;
1723
use core_rpc_types::{
1824
AssetInfo, AssetType, DaoClaimPayload, DaoDepositPayload, DaoWithdrawPayload, ExtraType, From,
1925
HashAlgorithm, Item, JsonItem, Mode, SignAlgorithm, SignatureAction, SimpleTransferPayload,
@@ -22,12 +28,6 @@ use core_rpc_types::{
2228
};
2329
use core_storage::Storage;
2430

25-
use ckb_jsonrpc_types::TransactionView as JsonTransactionView;
26-
use ckb_types::core::{
27-
EpochNumberWithFraction, ScriptHashType, TransactionBuilder, TransactionView,
28-
};
29-
use ckb_types::{bytes::Bytes, constants::TX_VERSION, packed, prelude::*, H160, H256, U256};
30-
3131
use std::collections::{HashMap, HashSet};
3232
use std::convert::TryFrom;
3333
use std::str::FromStr;
@@ -164,7 +164,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
164164
None,
165165
SECP256K1_CODE_HASH.get(),
166166
Some(ExtraType::Dao),
167-
&mut common::PaginationRequest::default(),
167+
&mut PaginationRequest::default(),
168168
)
169169
.await?
170170
} else if is_pw_lock(&address) {
@@ -176,7 +176,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
176176
None,
177177
PW_LOCK_CODE_HASH.get(),
178178
Some(ExtraType::Dao),
179-
&mut common::PaginationRequest::default(),
179+
&mut PaginationRequest::default(),
180180
)
181181
.await?
182182
} else {
@@ -336,7 +336,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
336336
None,
337337
SECP256K1_CODE_HASH.get(),
338338
Some(ExtraType::Dao),
339-
&mut common::PaginationRequest::default(),
339+
&mut PaginationRequest::default(),
340340
)
341341
.await?
342342
} else if is_pw_lock(&from_address) {
@@ -348,7 +348,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
348348
None,
349349
PW_LOCK_CODE_HASH.get(),
350350
Some(ExtraType::Dao),
351-
&mut common::PaginationRequest::default(),
351+
&mut PaginationRequest::default(),
352352
)
353353
.await?
354354
} else {
@@ -665,7 +665,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
665665
None,
666666
lock_filter,
667667
None,
668-
&mut common::PaginationRequest::default(),
668+
&mut PaginationRequest::default(),
669669
)
670670
.await?
671671
.into_iter()
@@ -831,7 +831,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
831831
None,
832832
lock_filter,
833833
None,
834-
&mut common::PaginationRequest::default().limit(Some(1)),
834+
&mut PaginationRequest::default().limit(Some(1)),
835835
)
836836
.await?;
837837
if live_acps.is_empty() {
@@ -1132,7 +1132,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
11321132
None,
11331133
ACP_CODE_HASH.get(),
11341134
None,
1135-
&mut common::PaginationRequest::default().limit(Some(1)),
1135+
&mut PaginationRequest::default().limit(Some(1)),
11361136
)
11371137
.await?
11381138
} else if is_pw_lock(&to_address) {
@@ -1144,7 +1144,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
11441144
None,
11451145
PW_LOCK_CODE_HASH.get(),
11461146
None,
1147-
&mut common::PaginationRequest::default().limit(Some(1)),
1147+
&mut PaginationRequest::default().limit(Some(1)),
11481148
)
11491149
.await?
11501150
} else {
@@ -1548,7 +1548,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
15481548
None,
15491549
lock_filter,
15501550
None,
1551-
&mut common::PaginationRequest::default().limit(Some(1)),
1551+
&mut PaginationRequest::default().limit(Some(1)),
15521552
)
15531553
.await?;
15541554
if live_acps.is_empty() {

0 commit comments

Comments
 (0)