Update outputs directory

This commit is contained in:
howardwu 2020-08-02 22:51:48 -07:00
parent cfb627d468
commit b58ee7233a
42 changed files with 62 additions and 47 deletions

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
**/target **/target
/tmp/ /tmp/
**.idea/ **.idea/
outputs/
*.DS_Store *.DS_Store

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
4515828aedc8e4ff8fe7555eabcb3da1fd155e7d35743d1322e763dfb477df83

View File

@ -0,0 +1 @@
a8083686e43fd326bd715555ef323dcec82c859403428cb4bd33368d5893eaac

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
d11c379b6a0ea2e0da8c9980db0c8705d18b047799b4372e8786dc44a6ee1495

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
ccedb51d6030e8775a49346b694e53da5d3fdb57b884320231eb3c9ecf7c4df6

View File

@ -1,9 +1,10 @@
use crate::{cli::*, cli_types::*, errors::CLIError}; use crate::{cli::*, cli_types::*, errors::CLIError};
use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType}; use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType};
use leo_package::{ use leo_package::{
directories::{source::SOURCE_DIRECTORY_NAME, OutputDirectory, OUTPUT_DIRECTORY_NAME}, directories::source::SOURCE_DIRECTORY_NAME,
files::{ChecksumFile, LibFile, MainFile, Manifest, LIB_FILE_NAME, MAIN_FILE_NAME}, files::{LibFile, MainFile, Manifest, LIB_FILE_NAME, MAIN_FILE_NAME},
inputs::*, inputs::*,
outputs::{ChecksumFile, OutputDirectory, OUTPUT_DIRECTORY_NAME},
}; };
use snarkos_algorithms::snark::groth16::KeypairAssembly; use snarkos_algorithms::snark::groth16::KeypairAssembly;

View File

@ -1,5 +1,8 @@
use crate::{cli::*, cli_types::*, errors::CLIError}; use crate::{cli::*, cli_types::*, errors::CLIError};
use leo_package::files::{ChecksumFile, Manifest, ProofFile, ProvingKeyFile, VerificationKeyFile}; use leo_package::{
files::Manifest,
outputs::{ChecksumFile, ProofFile, ProvingKeyFile, VerificationKeyFile},
};
use clap::ArgMatches; use clap::ArgMatches;
use std::{convert::TryFrom, env::current_dir}; use std::{convert::TryFrom, env::current_dir};

View File

@ -1,5 +1,5 @@
use crate::{cli::*, cli_types::*, commands::SetupCommand, errors::CLIError}; use crate::{cli::*, cli_types::*, commands::SetupCommand, errors::CLIError};
use leo_package::files::{Manifest, ProofFile}; use leo_package::{files::Manifest, outputs::ProofFile};
use snarkos_algorithms::snark::groth16::{Groth16, PreparedVerifyingKey, Proof}; use snarkos_algorithms::snark::groth16::{Groth16, PreparedVerifyingKey, Proof};
use snarkos_curves::bls12_377::{Bls12_377, Fr}; use snarkos_curves::bls12_377::{Bls12_377, Fr};

View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*, commands::BuildCommand, errors::CLIError}; use crate::{cli::*, cli_types::*, commands::BuildCommand, errors::CLIError};
use leo_package::{ use leo_package::{
directories::output::OutputDirectory,
files::{Manifest, ZipFile}, files::{Manifest, ZipFile},
outputs::OutputDirectory,
}; };
use clap::ArgMatches; use clap::ArgMatches;

View File

@ -7,7 +7,8 @@ use crate::{
use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType}; use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType};
use leo_package::{ use leo_package::{
directories::SOURCE_DIRECTORY_NAME, directories::SOURCE_DIRECTORY_NAME,
files::{Manifest, ProvingKeyFile, VerificationKeyFile, MAIN_FILE_NAME}, files::{Manifest, MAIN_FILE_NAME},
outputs::{ProvingKeyFile, VerificationKeyFile},
}; };
use snarkos_algorithms::snark::groth16::{Groth16, Parameters, PreparedVerifyingKey, VerifyingKey}; use snarkos_algorithms::snark::groth16::{Groth16, Parameters, PreparedVerifyingKey, VerifyingKey};

View File

@ -5,9 +5,10 @@ use crate::{
}; };
use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType}; use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType};
use leo_package::{ use leo_package::{
directories::{output::OUTPUT_DIRECTORY_NAME, source::SOURCE_DIRECTORY_NAME}, directories::source::SOURCE_DIRECTORY_NAME,
files::{MainFile, Manifest, MAIN_FILE_NAME}, files::{MainFile, Manifest, MAIN_FILE_NAME},
inputs::*, inputs::*,
outputs::OUTPUT_DIRECTORY_NAME,
}; };
use snarkos_curves::edwards_bls12::Fq; use snarkos_curves::edwards_bls12::Fq;

View File

@ -1,8 +1,5 @@
pub mod imports; pub mod imports;
pub use self::imports::*; pub use self::imports::*;
pub mod output;
pub use self::output::*;
pub mod source; pub mod source;
pub use self::source::*; pub use self::source::*;

View File

@ -1,8 +1,5 @@
pub mod imports; pub mod imports;
pub use self::imports::*; pub use self::imports::*;
pub mod output;
pub use self::output::*;
pub mod source; pub mod source;
pub use self::source::*; pub use self::source::*;

View File

@ -1,9 +1,6 @@
pub mod zip; pub mod zip;
pub use self::zip::*; pub use self::zip::*;
pub mod checksum;
pub use self::checksum::*;
pub mod gitignore; pub mod gitignore;
pub use self::gitignore::*; pub use self::gitignore::*;
@ -15,12 +12,3 @@ pub use self::main::*;
pub mod manifest; pub mod manifest;
pub use self::manifest::*; pub use self::manifest::*;
pub mod proof;
pub use self::proof::*;
pub mod proving_key;
pub use self::proving_key::*;
pub mod verification_key;
pub use self::verification_key::*;

View File

@ -6,3 +6,6 @@ pub use self::files::*;
pub mod inputs; pub mod inputs;
pub use inputs::*; pub use inputs::*;
pub mod outputs;
pub use outputs::*;

View File

@ -0,0 +1,14 @@
pub mod checksum;
pub use checksum::*;
pub mod directory;
pub use self::directory::*;
pub mod proof;
pub use proof::*;
pub mod proving_key;
pub use proving_key::*;
pub mod verification_key;
pub use verification_key::*;

View File

@ -1,9 +1,3 @@
pub mod zip;
pub use self::zip::*;
pub mod checksum;
pub use self::checksum::*;
pub mod gitignore; pub mod gitignore;
pub use self::gitignore::*; pub use self::gitignore::*;
@ -16,11 +10,5 @@ pub use self::main::*;
pub mod manifest; pub mod manifest;
pub use self::manifest::*; pub use self::manifest::*;
pub mod proof; pub mod zip;
pub use self::proof::*; pub use self::zip::*;
pub mod proving_key;
pub use self::proving_key::*;
pub mod verification_key;
pub use self::verification_key::*;

View File

@ -1,15 +1,16 @@
//! The program package zip file. //! The program package zip file.
use crate::{ use crate::{
directories::{IMPORTS_DIRECTORY_NAME, OUTPUT_DIRECTORY_NAME}, directories::IMPORTS_DIRECTORY_NAME,
errors::ZipFileError, errors::ZipFileError,
files::{ inputs::{INPUT_DIRECTORY_NAME, INPUT_FILE_EXTENSION},
outputs::{
CHECKSUM_FILE_EXTENSION, CHECKSUM_FILE_EXTENSION,
OUTPUT_DIRECTORY_NAME,
PROOF_FILE_EXTENSION, PROOF_FILE_EXTENSION,
PROVING_KEY_FILE_EXTENSION, PROVING_KEY_FILE_EXTENSION,
VERIFICATION_KEY_FILE_EXTENSION, VERIFICATION_KEY_FILE_EXTENSION,
}, },
inputs::{INPUT_DIRECTORY_NAME, INPUT_FILE_EXTENSION},
}; };
use serde::Deserialize; use serde::Deserialize;

View File

@ -7,3 +7,4 @@ pub use errors::*;
pub mod directories; pub mod directories;
pub mod files; pub mod files;
pub mod inputs; pub mod inputs;
pub mod outputs;

View File

@ -1,6 +1,6 @@
//! The build checksum file. //! The build checksum file.
use crate::{directories::output::OUTPUT_DIRECTORY_NAME, errors::ChecksumFileError}; use crate::{errors::ChecksumFileError, outputs::OUTPUT_DIRECTORY_NAME};
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{

View File

@ -0,0 +1,17 @@
pub mod checksum;
pub use self::checksum::*;
pub mod directory;
pub use directory::*;
// pub mod output;
// pub use output::*;
pub mod proof;
pub use self::proof::*;
pub mod proving_key;
pub use self::proving_key::*;
pub mod verification_key;
pub use self::verification_key::*;

View File

@ -1,6 +1,6 @@
//! The proof file. //! The proof file.
use crate::{directories::output::OUTPUT_DIRECTORY_NAME, errors::ProofFileError}; use crate::{errors::ProofFileError, outputs::OUTPUT_DIRECTORY_NAME};
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{

View File

@ -1,6 +1,6 @@
//! The proving key file. //! The proving key file.
use crate::{directories::output::OUTPUT_DIRECTORY_NAME, errors::ProvingKeyFileError}; use crate::{errors::ProvingKeyFileError, outputs::OUTPUT_DIRECTORY_NAME};
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{

View File

@ -1,6 +1,6 @@
//! The verification key file. //! The verification key file.
use crate::{directories::output::OUTPUT_DIRECTORY_NAME, errors::VerificationKeyFileError}; use crate::{errors::VerificationKeyFileError, outputs::OUTPUT_DIRECTORY_NAME};
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{