Skip to content

Commit

Permalink
use faster-hex for test.
Browse files Browse the repository at this point in the history
  • Loading branch information
@EthanYuan
EthanYuan committed Jan 18, 2024
1 parent 63fd5ec commit d0ef686
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion util/indexer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ numext-fixed-uint = "0.1"
[dev-dependencies]
tempfile.workspace = true
rand = "0.8"
hex = "0.4"
faster-hex = "0.6"
39 changes: 26 additions & 13 deletions util/indexer/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,7 @@ mod tests {
packed::{CellInput, CellOutputBuilder, OutPoint, Script, ScriptBuilder},
H256,
};
use faster_hex::hex_decode;

fn new_store(prefix: &str) -> RocksdbStore {
let tmp_dir = tempfile::Builder::new().prefix(prefix).tempdir().unwrap();
Expand Down Expand Up @@ -2031,6 +2032,8 @@ mod tests {
.output_data(Default::default())
.build();

let mut data = [0u8; 7];
hex_decode("62e907b15cbfaa".as_bytes(), &mut data).unwrap();
let tx01 = TransactionBuilder::default()
.output(
CellOutputBuilder::default()
Expand All @@ -2039,7 +2042,7 @@ mod tests {
.type_(Some(type_script11.clone()).pack())
.build(),
)
.output_data(hex::decode("62e907b15cbfaa").unwrap().pack())
.output_data(data.to_vec().pack())
.build();

let block0 = BlockBuilder::default()
Expand All @@ -2052,12 +2055,14 @@ mod tests {
indexer.append(&block0).unwrap();

// test get_cells rpc with output_data Prefix search mode
let mut data = [0u8; 1];
hex_decode("62".as_bytes(), &mut data).unwrap();
let cells = rpc
.get_cells(
IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("62").unwrap())),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Prefix),
..Default::default()
}),
Expand All @@ -2076,7 +2081,7 @@ mod tests {
IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("").unwrap())),
output_data: Some(JsonBytes::from_vec(vec![])),
output_data_filter_mode: Some(IndexerSearchMode::Prefix),
..Default::default()
}),
Expand All @@ -2090,12 +2095,14 @@ mod tests {
assert_eq!(1, cells.objects.len(),);

// test get_cells rpc with output_data Partial search mode
let mut data = [0u8; 3];
hex_decode("e907b1".as_bytes(), &mut data).unwrap();
let cells = rpc
.get_cells(
IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("e907b1").unwrap())),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Partial),
..Default::default()
}),
Expand All @@ -2109,14 +2116,14 @@ mod tests {
assert_eq!(1, cells.objects.len(),);

// test get_cells rpc with output_data Exact search mode
let mut data = [0u8; 7];
hex_decode("62e907b15cbfaa".as_bytes(), &mut data).unwrap();
let cells = rpc
.get_cells(
IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(
hex::decode("62e907b15cbfaa").unwrap(),
)),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Exact),
..Default::default()
}),
Expand All @@ -2134,7 +2141,7 @@ mod tests {
IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("").unwrap())),
output_data: Some(JsonBytes::from_vec(vec![])),
output_data_filter_mode: Some(IndexerSearchMode::Partial),
..Default::default()
}),
Expand All @@ -2151,11 +2158,13 @@ mod tests {
);

// test get_cells_capacity rpc with output_data Exact search mode
let mut data = [0u8; 7];
hex_decode("62e907b15cbfaa".as_bytes(), &mut data).unwrap();
let cells_capacity = rpc
.get_cells_capacity(IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("62e907b15cbfaa").unwrap())),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Exact),
..Default::default()
}),
Expand All @@ -2166,11 +2175,13 @@ mod tests {
assert_eq!(200000000000, capacity);

// test get_cells_capacity rpc with output_data Prefix search mode
let mut data = [0u8; 6];
hex_decode("62e907b15cbf".as_bytes(), &mut data).unwrap();
let cells_capacity = rpc
.get_cells_capacity(IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("62e907b15cbf").unwrap())),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Prefix),
..Default::default()
}),
Expand All @@ -2185,7 +2196,7 @@ mod tests {
.get_cells_capacity(IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("").unwrap())),
output_data: Some(JsonBytes::from_vec(vec![])),
output_data_filter_mode: Some(IndexerSearchMode::Prefix),
..Default::default()
}),
Expand All @@ -2196,11 +2207,13 @@ mod tests {
assert_eq!(200000000000, capacity);

// test get_cells_capacity rpc with output_data Partial search mode
let mut data = [0u8; 2];
hex_decode("5cbf".as_bytes(), &mut data).unwrap();
let cells_capacity = rpc
.get_cells_capacity(IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("5cbf").unwrap())),
output_data: Some(JsonBytes::from_vec(data.to_vec())),
output_data_filter_mode: Some(IndexerSearchMode::Partial),
..Default::default()
}),
Expand All @@ -2214,7 +2227,7 @@ mod tests {
let cells_capacity = rpc.get_cells_capacity(IndexerSearchKey {
script: lock_script11.clone().into(),
filter: Some(IndexerSearchKeyFilter {
output_data: Some(JsonBytes::from_vec(hex::decode("").unwrap())),
output_data: Some(JsonBytes::from_vec(vec![])),
output_data_filter_mode: Some(IndexerSearchMode::Partial),
..Default::default()
}),
Expand Down

0 comments on commit d0ef686

Please sign in to comment.