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

fix(platform)!: fix reference of items between epochs #2064

Merged
merged 23 commits into from
Aug 20, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
more work
QuantumExplorer committed Aug 20, 2024

Verified

This commit was signed with the committer’s verified signature.
commit e1f4f14dc9658d7b74c31b4d7e8e12ab15eaa016
39 changes: 27 additions & 12 deletions Cargo.lock

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

Original file line number Diff line number Diff line change
@@ -1514,7 +1514,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2164,7 +2164,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2426,7 +2426,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2684,7 +2684,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2946,7 +2946,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -3106,7 +3106,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -3453,7 +3453,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -3871,7 +3871,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -4098,7 +4098,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -4716,7 +4716,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(issues.len(), 0);
@@ -253,7 +253,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -323,7 +323,7 @@ mod tests {
let issues = platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
14 changes: 11 additions & 3 deletions packages/rs-drive-abci/src/main.rs
Original file line number Diff line number Diff line change
@@ -333,7 +333,12 @@ fn verify_grovedb(db_path: &PathBuf, force: bool) -> Result<(), String> {
let grovedb = drive::grovedb::GroveDb::open(db_path).expect("open grovedb");
//todo: get platform version instead of taking latest
let result = grovedb
.visualize_verify_grovedb(None, true, &PlatformVersion::latest().drive.grove_version)
.visualize_verify_grovedb(
None,
true,
true,
&PlatformVersion::latest().drive.grove_version,
)
.map_err(|e| e.to_string());

match result {
@@ -483,7 +488,7 @@ mod test {

for (i, item) in iter.enumerate() {
let (key, mut value) = item.unwrap();
println!("{} = {}", hex::encode(&key), hex::encode(&value));
println!("{} = {}", hex::encode(&key), hex::encode(&value));
tracing::trace!(cf, key=?hex::encode(&key), value=hex::encode(&value),"found item in rocksdb");

if i == n {
@@ -509,7 +514,10 @@ mod test {
corrupt_rocksdb_item(&db_path, "roots", 0);

let result_error = super::verify_grovedb(&db_path, true).expect_err("expected an error");
assert_eq!(result_error, "data corruption error: expected merk to contain value at key");
assert_eq!(
result_error,
"data corruption error: expected merk to contain value at key 0x08 for tree"
);

println!("db path: {:?}", &db_path);
}
10 changes: 5 additions & 5 deletions packages/rs-drive-abci/tests/strategy_tests/main.rs
Original file line number Diff line number Diff line change
@@ -1795,7 +1795,7 @@ mod tests {
.platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2430,7 +2430,7 @@ mod tests {
.platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2560,7 +2560,7 @@ mod tests {
.platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2716,7 +2716,7 @@ mod tests {
.platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
@@ -2870,7 +2870,7 @@ mod tests {
.platform
.drive
.grove
.visualize_verify_grovedb(None, true, &platform_version.drive.grove_version)
.visualize_verify_grovedb(None, true, false,&platform_version.drive.grove_version)
.expect("expected to have no issues");

assert_eq!(
10 changes: 5 additions & 5 deletions packages/rs-drive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -51,11 +51,11 @@ enum-map = { version = "2.0.3", optional = true }
intmap = { version = "2.0.0", features = ["serde"], optional = true }
chrono = { version = "0.4.35", optional = true }
itertools = { version = "0.11.0", optional = true }
grovedb = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op"}
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb"}

[dev-dependencies]
criterion = "0.3.5"
2 changes: 1 addition & 1 deletion packages/rs-platform-version/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ license = "MIT"
thiserror = { version = "1.0.59" }
bincode = { version = "2.0.0-rc.3"}
versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", branch = "verify_ref_after_batch_op" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb" }
once_cell = "1.19.0"

[features]