waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(plutus_version): use a cuter name in the config field

This commit is contained in:
rvcas 2024-05-21 17:13:08 -04:00
parent 489eff7f5b
commit f5c4f4cb37
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/aiken-project/src/blueprint/mod.rs
View File

@ -144,7 +144,7 @@ impl From<&Config> for Preamble {
name: "Aiken".to_string(), name: "Aiken".to_string(),
version: config::compiler_version(true), version: config::compiler_version(true),
}), }),
plutus_version: config.plutus_version, plutus_version: config.plutus,
version: config.version.clone(), version: config.version.clone(),
license: config.license.clone(), license: config.license.clone(),
} }

4
crates/aiken-project/src/config.rs
View File

@ -12,7 +12,7 @@ pub use aiken_lang::plutus_version::PlutusVersion;
pub struct Config { pub struct Config {
pub name: PackageName, pub name: PackageName,
pub version: String, pub version: String,
pub plutus_version: PlutusVersion, pub plutus: PlutusVersion,
pub license: Option<String>, pub license: Option<String>,
#[serde(default)] #[serde(default)]
pub description: String, pub description: String,
@ -58,7 +58,7 @@ impl Config {
Config { Config {
name: name.clone(), name: name.clone(),
version: "0.0.0".to_string(), version: "0.0.0".to_string(),
plutus_version: PlutusVersion::default(), plutus: PlutusVersion::default(),
license: Some("Apache-2.0".to_string()), license: Some("Apache-2.0".to_string()),
description: format!("Aiken contracts for project '{name}'"), description: format!("Aiken contracts for project '{name}'"),
repository: Some(Repository { repository: Some(Repository {

8
crates/aiken-project/src/lib.rs
View File

@ -142,7 +142,7 @@ where
pub fn new_generator(&'_ self, tracing: Tracing) -> CodeGenerator<'_> { pub fn new_generator(&'_ self, tracing: Tracing) -> CodeGenerator<'_> {
CodeGenerator::new( CodeGenerator::new(
self.config.plutus_version, self.config.plutus,
utils::indexmap::as_ref_values(&self.functions), utils::indexmap::as_ref_values(&self.functions),
utils::indexmap::as_ref_values(&self.data_types), utils::indexmap::as_ref_values(&self.data_types),
utils::indexmap::as_str_ref_values(&self.module_types), utils::indexmap::as_str_ref_values(&self.module_types),
@ -437,7 +437,7 @@ where
Ok(validator.program.address( Ok(validator.program.address(
network, network,
delegation_part.to_owned(), delegation_part.to_owned(),
&self.config.plutus_version.into(), &self.config.plutus.into(),
)) ))
} }
}) })
@ -466,7 +466,7 @@ where
} else { } else {
let cbor = validator.program.to_cbor().unwrap(); let cbor = validator.program.to_cbor().unwrap();
let validator_hash = match self.config.plutus_version { let validator_hash = match self.config.plutus {
PlutusVersion::V1 => cardano::PlutusV1Script(cbor.into()).compute_hash(), PlutusVersion::V1 => cardano::PlutusV1Script(cbor.into()).compute_hash(),
PlutusVersion::V2 => cardano::PlutusV2Script(cbor.into()).compute_hash(), PlutusVersion::V2 => cardano::PlutusV2Script(cbor.into()).compute_hash(),
PlutusVersion::V3 => cardano::PlutusV3Script(cbor.into()).compute_hash(), PlutusVersion::V3 => cardano::PlutusV3Script(cbor.into()).compute_hash(),
@ -853,7 +853,7 @@ where
let data_types = utils::indexmap::as_ref_values(&self.data_types); let data_types = utils::indexmap::as_ref_values(&self.data_types);
let plutus_version = &self.config.plutus_version; let plutus_version = &self.config.plutus;
tests tests
.into_par_iter() .into_par_iter()

2
crates/aiken/src/cmd/blueprint/convert.rs
View File

@ -72,7 +72,7 @@ pub fn exec(
let opt_config = Config::load(&project_path).ok(); let opt_config = Config::load(&project_path).ok();
let cardano_cli_type = opt_config let cardano_cli_type = opt_config
.map(|config| config.plutus_version) .map(|config| config.plutus)
.unwrap_or_default() .unwrap_or_default()
.cardano_cli_type(); .cardano_cli_type();