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.

Sign up for GitHub

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

Jump to bottom

Update v0_1::ChainConfig::from(v0_3::ChainConfig) #1886

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Update v0_1::ChainConfig::from(v0_3::ChainConfig) #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

29 changes: 26 additions & 3 deletions types/src/v0/v0_3/chain_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use committable::{Commitment, Committable};
use ethers::types::{Address, U256};
use itertools::Either;
use serde::{Deserialize, Serialize};
use std::str::FromStr;

/// Global variables for an Espresso blockchain.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
Expand Down Expand Up @@ -110,9 +109,8 @@ impl From<&v0_1::ResolvableChainConfig> for ResolvableChainConfig {
Either::Left(chain_config) => ResolvableChainConfig {
chain_config: Either::Left(ChainConfig::from(chain_config)),
},
// TODO does this work? is there a better way?
Either::Right(c) => ResolvableChainConfig {
chain_config: Either::Right(Commitment::from_str(&c.to_string()).unwrap()),
chain_config: Either::Right(Commitment::from_raw(*c.as_ref())),
},
}
}
Expand Down Expand Up @@ -173,3 +171,28 @@ impl Default for ChainConfig {
}
}
}

#[cfg(test)]
mod test {
use super::*;

#[test]
fn test_upgrade_chain_config_v3_resolvable_chain_config_from_v1() {
let expectation: ResolvableChainConfig = ChainConfig::default().into();
let v1_resolvable: v0_1::ResolvableChainConfig = v0_1::ChainConfig::default().into();
let v3_resolvable: ResolvableChainConfig = ResolvableChainConfig::from(&v1_resolvable);
assert_eq!(expectation, v3_resolvable);
let expectation: ResolvableChainConfig = ChainConfig::default().commit().into();
let v1_resolvable: v0_1::ResolvableChainConfig =
v0_1::ChainConfig::default().commit().into();
let v3_resolvable: ResolvableChainConfig = ResolvableChainConfig::from(&v1_resolvable);
assert_eq!(expectation, v3_resolvable);
}
#[test]
fn test_upgrade_chain_config_v1_chain_config_from_v3() {
let expectation = v0_1::ChainConfig::default();
let v3_chain_config = ChainConfig::default();
let v1_chain_config = v0_1::ChainConfig::from(v3_chain_config);
assert_eq!(expectation, v1_chain_config);
}
}
Loading