Skip to content

Commit 49241a8

Browse files
snormoresnormore
committed
refactor(merklize): rename with_tables to register_tables
1 parent f7aa550 commit 49241a8

18 files changed

+63
-52
lines changed

‎lib/merklize/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn main() {
2323
}
2424

2525
fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(builder: B) {
26-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
26+
let mut db = M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
2727
.build()
2828
.unwrap();
2929
let query = db.query();

‎lib/merklize/benches/generic_commit_changes.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,10 @@ fn generic_merklize_bench_commit_changes<C: StorageBackendConstructor, M>(
228228
) where
229229
M: MerklizeProvider<Storage = C::Storage>,
230230
{
231-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
232-
.build()
233-
.unwrap();
231+
let mut db =
232+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
233+
.build()
234+
.unwrap();
234235

235236
b.iter(|| {
236237
db.run(|ctx| {

‎lib/merklize/benches/generic_generate_proof.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ fn generic_bench_generate_proof<C: StorageBackendConstructor, M>(
206206
) where
207207
M: MerklizeProvider<Storage = C::Storage>,
208208
{
209-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
210-
.build()
211-
.unwrap();
209+
let mut db =
210+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
211+
.build()
212+
.unwrap();
212213

213214
db.run(|ctx| {
214215
let mut data_table = ctx.get_table::<String, String>("data");

‎lib/merklize/benches/generic_get_state_root.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,10 @@ fn generic_bench_get_state_root<C: StorageBackendConstructor, M>(
205205
) where
206206
M: MerklizeProvider<Storage = C::Storage>,
207207
{
208-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
209-
.build()
210-
.unwrap();
208+
let mut db =
209+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
210+
.build()
211+
.unwrap();
211212

212213
db.run(|ctx| {
213214
let mut data_table = ctx.get_table::<String, String>("data");

‎lib/merklize/benches/generic_rebuild_state_tree.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ fn generic_bench_rebuild_state_tree<C: StorageBackendConstructor, M>(
209209
) where
210210
M: MerklizeProvider<Storage = C::Storage>,
211211
{
212-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
213-
.build()
214-
.unwrap();
212+
let mut db =
213+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
214+
.build()
215+
.unwrap();
215216

216217
db.run(|ctx| {
217218
let mut data_table = ctx.get_table::<String, String>("data");

‎lib/merklize/benches/generic_verify_proof.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ fn generic_bench_verify_proof<C: StorageBackendConstructor, M>(
206206
) where
207207
M: MerklizeProvider<Storage = C::Storage>,
208208
{
209-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
210-
.build()
211-
.unwrap();
209+
let mut db =
210+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
211+
.build()
212+
.unwrap();
212213

213214
db.run(|ctx| {
214215
let mut data_table = ctx.get_table::<String, String>("data");

‎lib/merklize/benches/generic_verify_state_tree.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ fn generic_bench_verify_state_tree<C: StorageBackendConstructor, M>(
209209
) where
210210
M: MerklizeProvider<Storage = C::Storage>,
211211
{
212-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
213-
.build()
214-
.unwrap();
212+
let mut db =
213+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
214+
.build()
215+
.unwrap();
215216

216217
db.run(|ctx| {
217218
let mut data_table = ctx.get_table::<String, String>("data");

‎lib/merklize/examples/jmt-keccak.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ pub fn main() {
1616
}
1717

1818
fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(builder: B) {
19-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
20-
.build()
21-
.unwrap();
19+
let mut db =
20+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
21+
.build()
22+
.unwrap();
2223
let query = db.query();
2324

2425
// Open writer context and insert some data.

‎lib/merklize/examples/jmt-sha256.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ pub fn main() {
1616
}
1717

1818
fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(builder: B) {
19-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
20-
.build()
21-
.unwrap();
19+
let mut db =
20+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
21+
.build()
22+
.unwrap();
2223
let query = db.query();
2324

2425
// Open writer context and insert some data.

‎lib/merklize/examples/mpt-blake3.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ pub fn main() {
1616
}
1717

1818
fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(builder: B) {
19-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
20-
.build()
21-
.unwrap();
19+
let mut db =
20+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
21+
.build()
22+
.unwrap();
2223
let query = db.query();
2324

2425
// Open writer context and insert some data.

‎lib/merklize/examples/mpt-keccak.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ pub fn main() {
1616
}
1717

1818
fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(builder: B) {
19-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
20-
.build()
21-
.unwrap();
19+
let mut db =
20+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
21+
.build()
22+
.unwrap();
2223
let query = db.query();
2324

2425
// Open writer context and insert some data.

‎lib/merklize/examples/tracing/main.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ fn run<B: StorageBackendConstructor, M: MerklizeProvider<Storage = B::Storage>>(
4444
builder: B,
4545
data_count: usize,
4646
) {
47-
let mut db = M::with_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
48-
.build()
49-
.unwrap();
47+
let mut db =
48+
M::register_tables(AtomoBuilder::new(builder).with_table::<String, String>("data"))
49+
.build()
50+
.unwrap();
5051

5152
// Open writer context and insert some data.
5253
db.run(|ctx| {

‎lib/merklize/src/provider.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub trait MerklizeProvider {
3434
///
3535
/// Arguments:
3636
/// - `builder`: The atomo builder to augment.
37-
fn with_tables<C: StorageBackendConstructor>(
37+
fn register_tables<C: StorageBackendConstructor>(
3838
builder: AtomoBuilder<C, Self::Serde>,
3939
) -> AtomoBuilder<C, Self::Serde>;
4040

‎lib/merklize/src/providers/jmt/provider.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ where
7676
type Proof = JmtStateProof;
7777

7878
/// Augment the provided atomo builder with the necessary tables for the merklize provider.
79-
fn with_tables<C: StorageBackendConstructor>(
79+
fn register_tables<C: StorageBackendConstructor>(
8080
builder: AtomoBuilder<C, S>,
8181
) -> AtomoBuilder<C, S> {
8282
builder
@@ -312,7 +312,7 @@ where
312312
// Build a new, temporary state tree from the batch.
313313
let builder = AtomoBuilder::<_, S>::new(InMemoryStorage::default());
314314
type TempDbProvider<S, H> = JmtMerklizeProvider<InMemoryStorage, S, H>;
315-
let mut tmp_db = TempDbProvider::<S, H>::with_tables(builder).build()?;
315+
let mut tmp_db = TempDbProvider::<S, H>::register_tables(builder).build()?;
316316
tmp_db.run(|ctx| TempDbProvider::<S, H>::update_state_tree(ctx, batch))?;
317317

318318
// Get and return the state root hash from the temporary state tree.

‎lib/merklize/src/providers/jmt/tests.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn test_jmt_update_state_tree_from_context_with_updates() {
2020
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
2121

2222
let builder = AtomoBuilder::new(InMemoryStorage::default());
23-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
23+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
2424
.build()
2525
.unwrap();
2626

@@ -151,7 +151,7 @@ fn test_jmt_update_state_tree_from_context_with_no_changes() {
151151
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
152152

153153
let builder = AtomoBuilder::new(InMemoryStorage::default());
154-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
154+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
155155
.build()
156156
.unwrap();
157157

@@ -200,7 +200,7 @@ fn test_jmt_get_state_root_with_empty_state() {
200200
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
201201

202202
let builder = AtomoBuilder::new(InMemoryStorage::default());
203-
let db = M::with_tables(builder.with_table::<String, String>("data"))
203+
let db = M::register_tables(builder.with_table::<String, String>("data"))
204204
.build()
205205
.unwrap();
206206
let query = db.query();
@@ -220,7 +220,7 @@ fn test_jmt_get_state_root_with_updates() {
220220
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
221221

222222
let builder = AtomoBuilder::new(InMemoryStorage::default());
223-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
223+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
224224
.build()
225225
.unwrap();
226226
let query = db.query();
@@ -336,7 +336,7 @@ fn test_jmt_clear_and_rebuild_state_tree() {
336336
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
337337

338338
let builder = AtomoBuilder::new(InMemoryStorage::default());
339-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
339+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
340340
.build()
341341
.unwrap();
342342
let query = db.query();
@@ -390,7 +390,7 @@ fn test_jmt_get_state_proof_of_membership() {
390390
type M = JmtMerklizeProvider<InMemoryStorage, S, H>;
391391

392392
let builder = AtomoBuilder::new(InMemoryStorage::default());
393-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
393+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
394394
.build()
395395
.unwrap();
396396
let query = db.query();

‎lib/merklize/src/providers/mpt/provider.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ where
107107
type Proof = MptStateProof;
108108

109109
/// Augment the provided atomo builder with the necessary tables for the merklize provider.
110-
fn with_tables<C: StorageBackendConstructor>(
110+
fn register_tables<C: StorageBackendConstructor>(
111111
builder: AtomoBuilder<C, S>,
112112
) -> AtomoBuilder<C, S> {
113113
builder
@@ -290,7 +290,7 @@ where
290290
// Build a new, temporary state tree from the batch.
291291
let builder = AtomoBuilder::<_, S>::new(InMemoryStorage::default());
292292
type TempDbProvider<S, H> = MptMerklizeProvider<InMemoryStorage, S, H>;
293-
let mut tmp_db = TempDbProvider::<S, H>::with_tables(builder).build()?;
293+
let mut tmp_db = TempDbProvider::<S, H>::register_tables(builder).build()?;
294294
tmp_db.run(|ctx| TempDbProvider::<S, H>::update_state_tree(ctx, batch))?;
295295

296296
// Get and return the state root hash from the temporary state tree.

‎lib/merklize/src/providers/mpt/tests.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn test_mpt_update_state_tree_with_updates() {
1313
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
1414

1515
let builder = AtomoBuilder::new(InMemoryStorage::default());
16-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
16+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
1717
.build()
1818
.unwrap();
1919

@@ -112,7 +112,7 @@ fn test_mpt_update_state_tree_with_no_changes() {
112112
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
113113

114114
let builder = AtomoBuilder::new(InMemoryStorage::default());
115-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
115+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
116116
.build()
117117
.unwrap();
118118

@@ -161,7 +161,7 @@ fn test_mpt_get_state_root_with_empty_state() {
161161
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
162162

163163
let builder = AtomoBuilder::new(InMemoryStorage::default());
164-
let db = M::with_tables(builder.with_table::<String, String>("data"))
164+
let db = M::register_tables(builder.with_table::<String, String>("data"))
165165
.build()
166166
.unwrap();
167167
let query = db.query();
@@ -180,7 +180,7 @@ fn test_mpt_get_state_root_with_updates() {
180180
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
181181

182182
let builder = AtomoBuilder::new(InMemoryStorage::default());
183-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
183+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
184184
.build()
185185
.unwrap();
186186
let query = db.query();
@@ -328,7 +328,7 @@ fn test_mpt_clear_and_rebuild_state_tree() {
328328
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
329329

330330
let builder = AtomoBuilder::new(InMemoryStorage::default());
331-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
331+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
332332
.build()
333333
.unwrap();
334334
let query = db.query();
@@ -382,7 +382,7 @@ fn test_mpt_get_state_proof_of_membership() {
382382
type M = MptMerklizeProvider<InMemoryStorage, S, H>;
383383

384384
let builder = AtomoBuilder::new(InMemoryStorage::default());
385-
let mut db = M::with_tables(builder.with_table::<String, String>("data"))
385+
let mut db = M::register_tables(builder.with_table::<String, String>("data"))
386386
.build()
387387
.unwrap();
388388
let query = db.query();

‎lib/merklize/tests/generic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fn test_generic<
121121
>(
122122
builder: C,
123123
) {
124-
let builder = M::with_tables(
124+
let builder = M::register_tables(
125125
AtomoBuilder::new(builder)
126126
.with_table::<String, String>("data")
127127
.enable_iter("data")

0 commit comments

Comments
 (0)