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

Commit 51f4a05

Browse files
EthanYuanEthanYuan
committed
remove dep ckb-jsonrpc-types from common crate.
1 parent 13b66c0 commit 51f4a05

20 files changed

+188
-132
lines changed

‎Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ blake2b-rs = "0.2"
1313
bech32 = "0.8"
1414
ckb-hash = "0.101"
1515
creep = "0.3"
16-
ckb-jsonrpc-types = "0.101"
1716
ckb-types = "0.101"
1817
derive_more = "0.99"
1918
hex = "0.4"

‎common/src/lib.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ pub mod utils;
66
pub use address::{Address, AddressPayload, AddressType, CodeHashIndex};
77
pub use {anyhow, anyhow::Result, async_trait::async_trait, creep::Context, derive_more, minstant};
88

9-
use ckb_jsonrpc_types::Uint64;
109
use ckb_types::{bytes::Bytes, core::BlockNumber, h256, packed, H256};
1110
use derive_more::Display;
1211
use serde::{Deserialize, Serialize};
@@ -158,37 +157,34 @@ impl fmt::Display for NetworkType {
158157
#[derive(Serialize, Deserialize, Clone, Debug, Display, Hash, PartialEq, Eq)]
159158
#[display(fmt = "range from {} to {}", from, to)]
160159
pub struct Range {
161-
pub from: Uint64,
162-
pub to: Uint64,
160+
pub from: u64,
161+
pub to: u64,
163162
}
164163

165164
impl Range {
166165
pub fn new(from: u64, to: u64) -> Self {
167-
Range {
168-
from: from.into(),
169-
to: to.into(),
170-
}
166+
Range { from, to }
171167
}
172168

173169
pub fn is_in(&self, num: u64) -> bool {
174-
num >= self.from.into() && num <= self.to.into()
170+
num >= self.from && num <= self.to
175171
}
176172

177173
pub fn min(&self) -> u64 {
178-
self.from.into()
174+
self.from
179175
}
180176

181177
pub fn max(&self) -> u64 {
182-
self.to.into()
178+
self.to
183179
}
184180
}
185181

186182
#[derive(Serialize, Deserialize, Default, Clone, Debug, Hash, PartialEq, Eq)]
187183
pub struct PaginationRequest {
188-
pub cursor: Option<Uint64>,
184+
pub cursor: Option<u64>,
189185
pub order: Order,
190-
pub limit: Option<Uint64>,
191-
pub skip: Option<Uint64>,
186+
pub limit: Option<u64>,
187+
pub skip: Option<u64>,
192188
pub return_count: bool,
193189
}
194190

@@ -235,8 +231,8 @@ impl PaginationRequest {
235231
#[derive(Serialize, Deserialize, Clone, Debug, Hash, PartialEq, Eq)]
236232
pub struct PaginationResponse<T> {
237233
pub response: Vec<T>,
238-
pub next_cursor: Option<Uint64>,
239-
pub count: Option<Uint64>,
234+
pub next_cursor: Option<u64>,
235+
pub count: Option<u64>,
240236
}
241237

242238
impl<T> PaginationResponse<T> {

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ use core_rpc_types::{
1010
indexer, AdjustAccountPayload, BlockInfo, DaoClaimPayload, DaoDepositPayload,
1111
DaoWithdrawPayload, GetAccountInfoPayload, GetAccountInfoResponse, GetBalancePayload,
1212
GetBalanceResponse, GetBlockInfoPayload, GetSpentTransactionPayload,
13-
GetTransactionInfoResponse, MercuryInfo, QueryTransactionsPayload, SimpleTransferPayload,
14-
SudtIssuePayload, SyncState, TransactionCompletionResponse, TransferPayload, TxView,
13+
GetTransactionInfoResponse, MercuryInfo, PaginationResponse, QueryTransactionsPayload,
14+
SimpleTransferPayload, SudtIssuePayload, SyncState, TransactionCompletionResponse,
15+
TransferPayload, TxView,
1516
};
1617

1718
use crate::r#impl::build_tx::calculate_tx_size;
@@ -23,8 +24,8 @@ use common::lazy::{
2324
};
2425
use common::utils::ScriptInfo;
2526
use common::{
26-
async_trait, hash::blake2b_160, Address, AddressPayload, Context, NetworkType,
27-
PaginationResponse, ACP, CHEQUE, DAO, PW_LOCK, SECP256K1, SUDT,
27+
async_trait, hash::blake2b_160, Address, AddressPayload, Context, NetworkType, ACP, CHEQUE,
28+
DAO, PW_LOCK, SECP256K1, SUDT,
2829
};
2930
use core_rpc_types::error::MercuryRpcError;
3031
use core_storage::{DBInfo, RelationalStorage};

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use core_rpc_types::{
1212

1313
use common::hash::blake2b_256_to_160;
1414
use common::utils::decode_udt_amount;
15-
use common::{Context, DetailedCell, PaginationRequest, ACP, PW_LOCK, SECP256K1, SUDT};
15+
use common::{Context, DetailedCell, ACP, PW_LOCK, SECP256K1, SUDT};
1616
use common_logger::tracing_async;
1717

1818
use ckb_types::core::TransactionView;
@@ -59,7 +59,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
5959
None,
6060
lock_filter,
6161
None,
62-
&mut PaginationRequest::default(),
62+
&mut common::PaginationRequest::default(),
6363
)
6464
.await?;
6565
let live_acps_len = live_acps.len();
@@ -310,7 +310,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
310310
None,
311311
lock_filter,
312312
None,
313-
&mut PaginationRequest::default(),
313+
&mut common::PaginationRequest::default(),
314314
)
315315
.await?;
316316

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

+10-12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ use common::address::{is_acp, is_pw_lock, is_secp256k1};
55
use common::hash::blake2b_256_to_160;
66
use common::lazy::{ACP_CODE_HASH, DAO_CODE_HASH, PW_LOCK_CODE_HASH, SECP256K1_CODE_HASH};
77
use common::utils::decode_udt_amount;
8-
use common::{
9-
Address, Context, DetailedCell, PaginationRequest, ACP, CHEQUE, DAO, PW_LOCK, SECP256K1, SUDT,
10-
};
8+
use common::{Address, Context, DetailedCell, ACP, CHEQUE, DAO, PW_LOCK, SECP256K1, SUDT};
119
use core_rpc_types::lazy::CURRENT_EPOCH_NUMBER;
1210

1311
use common_logger::tracing_async;
@@ -166,7 +164,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
166164
None,
167165
SECP256K1_CODE_HASH.get(),
168166
Some(ExtraType::Dao),
169-
&mut PaginationRequest::default(),
167+
&mut common::PaginationRequest::default(),
170168
)
171169
.await?
172170
} else if is_pw_lock(&address) {
@@ -178,7 +176,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
178176
None,
179177
PW_LOCK_CODE_HASH.get(),
180178
Some(ExtraType::Dao),
181-
&mut PaginationRequest::default(),
179+
&mut common::PaginationRequest::default(),
182180
)
183181
.await?
184182
} else {
@@ -338,7 +336,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
338336
None,
339337
SECP256K1_CODE_HASH.get(),
340338
Some(ExtraType::Dao),
341-
&mut PaginationRequest::default(),
339+
&mut common::PaginationRequest::default(),
342340
)
343341
.await?
344342
} else if is_pw_lock(&from_address) {
@@ -350,7 +348,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
350348
None,
351349
PW_LOCK_CODE_HASH.get(),
352350
Some(ExtraType::Dao),
353-
&mut PaginationRequest::default(),
351+
&mut common::PaginationRequest::default(),
354352
)
355353
.await?
356354
} else {
@@ -667,7 +665,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
667665
None,
668666
lock_filter,
669667
None,
670-
&mut PaginationRequest::default(),
668+
&mut common::PaginationRequest::default(),
671669
)
672670
.await?
673671
.into_iter()
@@ -833,7 +831,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
833831
None,
834832
lock_filter,
835833
None,
836-
&mut PaginationRequest::default().limit(Some(1)),
834+
&mut common::PaginationRequest::default().limit(Some(1)),
837835
)
838836
.await?;
839837
if live_acps.is_empty() {
@@ -1134,7 +1132,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
11341132
None,
11351133
ACP_CODE_HASH.get(),
11361134
None,
1137-
&mut PaginationRequest::default().limit(Some(1)),
1135+
&mut common::PaginationRequest::default().limit(Some(1)),
11381136
)
11391137
.await?
11401138
} else if is_pw_lock(&to_address) {
@@ -1146,7 +1144,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
11461144
None,
11471145
PW_LOCK_CODE_HASH.get(),
11481146
None,
1149-
&mut PaginationRequest::default().limit(Some(1)),
1147+
&mut common::PaginationRequest::default().limit(Some(1)),
11501148
)
11511149
.await?
11521150
} else {
@@ -1550,7 +1548,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
15501548
None,
15511549
lock_filter,
15521550
None,
1553-
&mut PaginationRequest::default().limit(Some(1)),
1551+
&mut common::PaginationRequest::default().limit(Some(1)),
15541552
)
15551553
.await?;
15561554
if live_acps.is_empty() {

0 commit comments

Comments
 (0)