Skip to content

Commit

Permalink
update serde-reflection
Browse files Browse the repository at this point in the history
  • Loading branch information
ibalajiarun committed Dec 13, 2023
1 parent cc93424 commit 3b2a326
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 35 deletions.
50 changes: 25 additions & 25 deletions Cargo.lock

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

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ backoff = { version = "0.4.0", features = ["tokio"] }
backtrace = "0.3.58"
bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
better_any = "0.1.1"
bigdecimal = { version = "0.3.0", features = ["serde"] }
bigdecimal = { version = "0.4.0", features = ["serde"] }
version-compare = "0.1.1"
bitvec = "1.0.1"
blake2 = "0.10.4"
Expand Down Expand Up @@ -624,8 +624,8 @@ serde_json = { version = "1.0.81", features = ["preserve_order", "arbitrary_prec
serde_repr = "0.1"
serde_merge = "0.1.3"
serde-name = "0.1.1"
serde-generate = { git = "https://github.com/aptos-labs/serde-reflection", rev = "f2b5fb605dee0d2f8fd42a6d7faca177e524ea14" }
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "f2b5fb605dee0d2f8fd42a6d7faca177e524ea14" }
serde-generate = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
serde_yaml = "0.8.24"
shadow-rs = "0.16.2"
smallvec = "1.8.0"
Expand Down Expand Up @@ -749,7 +749,6 @@ debug-assertions = true
debug = true

[patch.crates-io]
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "f2b5fb605dee0d2f8fd42a6d7faca177e524ea14" }
merlin = { git = "https://github.com/aptos-labs/merlin" }
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
# More context here: https://github.com/weiznich/diesel_async/pull/121.
Expand Down
4 changes: 2 additions & 2 deletions crates/aptos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ move-unit-test = { workspace = true, features = [ "debugging" ] }
move-vm-runtime = { workspace = true, features = [ "testing" ] }
once_cell = { workspace = true }
poem = { workspace = true }
processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "2eea8d1d71ea195558d571202d3003071af8766b" }
processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "af795c0a082385908d8ff3c72e54d53810e337fc" }
rand = { workspace = true }
regex = { workspace = true }
reqwest = { workspace = true }
self_update = { version = "0.38.0", features = ["archive-zip", "compression-zip-deflate"] }
serde = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "2eea8d1d71ea195558d571202d3003071af8766b" }
server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "af795c0a082385908d8ff3c72e54d53810e337fc" }
tempfile = { workspace = true }
termcolor = { workspace = true }
thiserror = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions crates/aptos/src/node/local_testnet/processors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ impl ProcessorManager {
starting_version: None,
ending_version: None,
number_concurrent_processing_tasks: None,
enable_verbose_logging: None,
};
let manager = Self {
config,
Expand Down
2 changes: 1 addition & 1 deletion testsuite/generate-format/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub fn get_registry() -> Result<Registry> {
tracer.trace_type::<CoinStoreResource>(&samples)?;

// aliases within StructTag
tracer.ignore_aliases("StructTag", "type_args", &["type_params"])?;
tracer.ignore_aliases("StructTag", &["type_params"])?;

tracer.registry()
}
2 changes: 1 addition & 1 deletion testsuite/generate-format/src/aptos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub fn get_registry() -> Result<Registry> {
tracer.trace_type::<write_set::WriteOp>(&samples)?;

// aliases within StructTag
tracer.ignore_aliases("StructTag", "type_args", &["type_params"])?;
tracer.ignore_aliases("StructTag", &["type_params"])?;

tracer.registry()
}
2 changes: 1 addition & 1 deletion testsuite/generate-format/src/consensus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub fn get_registry() -> Result<Registry> {
tracer.trace_type::<aptos_consensus_types::common::Payload>(&samples)?;

// aliases within StructTag
tracer.ignore_aliases("StructTag", "type_args", &["type_params"])?;
tracer.ignore_aliases("StructTag", &["type_params"])?;

tracer.registry()
}
2 changes: 1 addition & 1 deletion testsuite/generate-format/src/move_abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn get_registry() -> Result<Registry> {
tracer.trace_type::<language_storage::TypeTag>(&samples)?;

// aliases within StructTag
tracer.ignore_aliases("StructTag", "type_args", &["type_params"])?;
tracer.ignore_aliases("StructTag", &["type_params"])?;

tracer.registry()
}

0 comments on commit 3b2a326

Please sign in to comment.