Skip to content

Commit 63b2a35

Browse files
committed
ci: fix serde deprecation and pin integration lock usage
1 parent 8ebf99f commit 63b2a35

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

devtools/ci/integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ cd plugin-protocol && cargo build --locked --example keystore_no_password && cd
5151
rm -rf test/target && ln -snf "${CKB_CLI_DIR}/target" test/target
5252
export RUST_LOG=ckb_cli=info,cli_test=info
5353

54-
cd test && cargo run -- \
54+
cd test && cargo run --locked -- \
5555
--ckb-bin "${CKB_BIN}" \
5656
--cli-bin "${CKB_CLI_DIR}/target/release/ckb-cli" \
5757
--keystore-plugin "${CKB_CLI_DIR}/target/debug/examples/keystore_no_password" \

src/utils/yaml_ser.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,11 @@ impl ser::Serializer for Serializer {
429429
Ok(Yaml::Integer(v))
430430
}
431431

432-
serde::serde_if_integer128! {
433-
fn serialize_i128(self, v: i128) -> Result<Yaml, Self::Error> {
434-
if v <= i64::MAX as i128 && v >= i64::MIN as i128 {
435-
self.serialize_i64(v as i64)
436-
} else {
437-
Ok(Yaml::Real(v.to_string()))
438-
}
432+
fn serialize_i128(self, v: i128) -> Result<Yaml, Self::Error> {
433+
if v <= i64::MAX as i128 && v >= i64::MIN as i128 {
434+
self.serialize_i64(v as i64)
435+
} else {
436+
Ok(Yaml::Real(v.to_string()))
439437
}
440438
}
441439

@@ -459,13 +457,11 @@ impl ser::Serializer for Serializer {
459457
}
460458
}
461459

462-
serde::serde_if_integer128! {
463-
fn serialize_u128(self, v: u128) -> Result<Yaml, Self::Error> {
464-
if v <= i64::MAX as u128 {
465-
self.serialize_i64(v as i64)
466-
} else {
467-
Ok(Yaml::Real(v.to_string()))
468-
}
460+
fn serialize_u128(self, v: u128) -> Result<Yaml, Self::Error> {
461+
if v <= i64::MAX as u128 {
462+
self.serialize_i64(v as i64)
463+
} else {
464+
Ok(Yaml::Real(v.to_string()))
469465
}
470466
}
471467

0 commit comments

Comments
 (0)