ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-26 03:33:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fmt & clippy

Browse Source
This commit is contained in:
d0cd 2023-02-05 12:08:04 -08:00
parent 641cbf251d
commit b921f959b4
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/compiler/tests/compile.rs
View File

@ -68,7 +68,7 @@ fn run_test(test: Test, handler: &Handler) -> Result<Value, ()> {
let bytecode = handler.extend_if_error(compile_and_process(&mut parsed))?;
// Set up the build directory.
let package = setup_build_directory(&program_name, &bytecode, &handler)?;
let package = setup_build_directory(&program_name, &bytecode, handler)?;
// Get the program process and check all instructions.
handler.extend_if_error(package.get_process().map_err(LeoError::Anyhow))?;

25
compiler/compiler/tests/execute.rs
View File

@ -1,4 +1,4 @@
// Copyright (C) 2019-2022 Aleo Systems Inc.
// Copyright (C) 2019-2023 Aleo Systems Inc.
// This file is part of the Leo library.
// The Leo library is free software: you can redistribute it and/or modify
@ -18,7 +18,7 @@ mod utilities;
use utilities::{buffer_if_err, compile_and_process, parse_program, BufferEmitter};
use utilities::{get_cwd_option, setup_build_directory, Aleo, Network};
use leo_errors::{emitter::Handler, LeoError};
use leo_errors::{emitter::Handler};
use leo_span::symbol::create_session_if_not_set_then;
use leo_test_framework::{
runner::{Namespace, ParseType, Runner},
@ -35,6 +35,7 @@ use serde_yaml::Value;
use std::collections::BTreeMap;
use std::{fs, path::Path, rc::Rc};
// TODO: Evaluate namespace.
struct ExecuteNamespace;
impl Namespace for ExecuteNamespace {
@ -93,7 +94,7 @@ fn run_test(test: Test, handler: &Handler, err_buf: &BufferEmitter) -> Result<Va
let mut results = BTreeMap::new();
// Setup the build directory.
let package = setup_build_directory(&program_name, &bytecode, &handler)?;
let package = setup_build_directory(&program_name, &bytecode, handler)?;
// Initialize an rng.
let rng = &mut rand::thread_rng();
@ -118,12 +119,18 @@ fn run_test(test: Test, handler: &Handler, err_buf: &BufferEmitter) -> Result<Va
// TODO: Add support for custom config like custom private keys.
// Execute the program and get the outputs.
let output_string = match package.run::<Aleo, _>(None, package.manifest_file().development_private_key(), function_name, &inputs, rng) {
let output_string = match package.run::<Aleo, _>(
None,
package.manifest_file().development_private_key(),
function_name,
&inputs,
rng,
) {
Ok((response, _, _, _)) => format!(
"[{}]",
response.outputs().iter().map(|output| output.to_string()).join(", ")
),
Err(err) => format!("SnarkVMError({:?})", err),
"[{}]",
response.outputs().iter().map(|output| output.to_string()).join(", ")
),
Err(err) => format!("SnarkVMError({err})"),
};
// Store the inputs and outputs in a map.
@ -153,7 +160,7 @@ fn run_test(test: Test, handler: &Handler, err_buf: &BufferEmitter) -> Result<Va
bytecode: hash_content(&bytecode),
results,
};
Ok(serde_yaml::to_value(&final_output).expect("serialization failed"))
Ok(serde_yaml::to_value(final_output).expect("serialization failed"))
}
struct TestRunner;

4
compiler/compiler/tests/utilities/mod.rs
View File

@ -1,4 +1,4 @@
// Copyright (C) 2019-2022 Aleo Systems Inc.
// Copyright (C) 2019-2023 Aleo Systems Inc.
// This file is part of the Leo library.
// The Leo library is free software: you can redistribute it and/or modify
@ -36,6 +36,7 @@ use std::{
};
pub type Network = Testnet3;
#[allow(unused)]
pub type Aleo = snarkvm::circuit::AleoV0;
pub fn hash_asts() -> (String, String, String, String) {
@ -169,6 +170,7 @@ impl Emitter for BufferEmitter {
}
}
#[allow(unused)]
pub fn buffer_if_err<T>(buf: &BufferEmitter, res: Result<T, String>) -> Result<T, ()> {
res.map_err(|err| buf.0.borrow_mut().push(LeoOrString::String(err)))
}