Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[crates] Rename accumulator to aptos-accumulator #5785

Merged
merged 1 commit into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ rust-version = "1.64"
[workspace.dependencies]
# Internal crate dependencies.
# Please do not add any test features here: they should be declared by the individual crate.
accumulator = { path = "storage/accumulator" }
aptos = { path = "crates/aptos" }
aptos-accumulator = { path = "storage/accumulator" }
aptos-aggregator = { path = "aptos-move/aptos-aggregator" }
aptos-api = { path = "api" }
aptos-api-test-context = { path = "api/test-context" }
Expand Down
2 changes: 1 addition & 1 deletion storage/accumulator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "accumulator"
name = "aptos-accumulator"
description = "Aptos merkle tree accumulator"
version = "0.1.0"

Expand Down
2 changes: 1 addition & 1 deletion storage/aptosdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository = { workspace = true }
rust-version = { workspace = true }

[dependencies]
accumulator = { workspace = true }
anyhow = { workspace = true }
aptos-accumulator = { workspace = true }
aptos-config = { workspace = true }
aptos-crypto = { workspace = true }
aptos-infallible = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion storage/aptosdb/src/event_store/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use crate::{
event_by_key::EventByKeySchema, event_by_version::EventByVersionSchema,
},
};
use accumulator::{HashReader, MerkleAccumulator};
use anyhow::{bail, ensure, format_err, Result};
use aptos_accumulator::{HashReader, MerkleAccumulator};
use aptos_crypto::{
hash::{CryptoHash, EventAccumulatorHasher},
HashValue,
Expand Down
2 changes: 1 addition & 1 deletion storage/aptosdb/src/ledger_store/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use crate::{
transaction_info::TransactionInfoSchema,
},
};
use accumulator::{HashReader, MerkleAccumulator};
use anyhow::{ensure, format_err, Result};
use aptos_accumulator::{HashReader, MerkleAccumulator};
use aptos_crypto::{
hash::{CryptoHash, TransactionAccumulatorHasher},
HashValue,
Expand Down
2 changes: 1 addition & 1 deletion storage/aptosdb/src/pruner/transaction_store/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use aptos_types::{
transaction::{SignedTransaction, Transaction},
};

use accumulator::HashReader;
use aptos_accumulator::HashReader;
use aptos_config::config::LedgerPrunerConfig;
use aptos_types::{
proof::position::Position,
Expand Down
2 changes: 1 addition & 1 deletion testsuite/aptos-fuzzer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository = { workspace = true }
rust-version = { workspace = true }

[dependencies]
accumulator = { workspace = true, features = ["fuzzing"] }
anyhow = { workspace = true }
aptos-accumulator = { workspace = true, features = ["fuzzing"] }
aptos-crypto = { workspace = true, features = ["fuzzing"] }
aptos-jellyfish-merkle = { workspace = true, features = ["fuzzing"] }
aptos-mempool = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl};
use accumulator::test_helpers::{
use aptos_accumulator::test_helpers::{
arb_hash_batch, arb_list_of_hash_batches, arb_three_hash_batches, arb_two_hash_batches,
test_append_empty_impl, test_append_many_impl, test_consistency_proof_impl,
test_get_frozen_subtree_hashes_impl, test_proof_impl, test_range_proof_impl,
Expand Down