[crates] Rename accumulator to aptos-accumulator (aptos-labs#5785)

areshand · Dec 17, 2022 · 6254520 · 6254520
1 parent cc27e67
commit 6254520
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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" }

diff --git a/storage/accumulator/Cargo.toml b/storage/accumulator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "accumulator"
+name = "aptos-accumulator"
 description = "Aptos merkle tree accumulator"
 version = "0.1.0"
 

diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml
@@ -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 }

diff --git a/storage/aptosdb/src/event_store/mod.rs b/storage/aptosdb/src/event_store/mod.rs
@@ -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,

diff --git a/storage/aptosdb/src/ledger_store/mod.rs b/storage/aptosdb/src/ledger_store/mod.rs
@@ -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,

diff --git a/storage/aptosdb/src/pruner/transaction_store/test.rs b/storage/aptosdb/src/pruner/transaction_store/test.rs
@@ -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,

diff --git a/testsuite/aptos-fuzzer/Cargo.toml b/testsuite/aptos-fuzzer/Cargo.toml
@@ -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 }

diff --git a/testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs
@@ -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,