Add root directory to package

leo/commands/build.rs

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

leo/commands/clean.rs

@@ -1,7 +1,7 @@
 use crate::{cli::*, cli_types::*, errors::CLIError};
 use leo_package::{
-    files::Manifest,
     outputs::{ChecksumFile, ProofFile, ProvingKeyFile, VerificationKeyFile},
+    root::Manifest,
 };
 
 use clap::ArgMatches;

leo/commands/deploy.rs

@@ -5,7 +5,7 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    files::Manifest,
+    root::Manifest,
     source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 

leo/commands/init.rs

@@ -4,8 +4,8 @@ use crate::{
     errors::{CLIError, InitError},
 };
 use leo_package::{
-    files::{Gitignore, Manifest},
     inputs::*,
+    root::{Gitignore, Manifest},
     source::{LibFile, MainFile, SourceDirectory},
 };
 

leo/commands/lint.rs

@@ -5,7 +5,7 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    files::Manifest,
+    root::Manifest,
     source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 

leo/commands/load.rs

@@ -5,7 +5,7 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    files::Manifest,
+    root::Manifest,
     source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 

leo/commands/new.rs

@@ -4,8 +4,8 @@ use crate::{
     errors::{CLIError, NewError},
 };
 use leo_package::{
-    files::{Gitignore, Manifest},
     inputs::*,
+    root::{Gitignore, Manifest},
     source::{LibFile, MainFile, SourceDirectory},
 };
 

leo/commands/prove.rs

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

leo/commands/publish.rs

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

leo/commands/setup.rs

@@ -6,8 +6,8 @@ use crate::{
 };
 use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType};
 use leo_package::{
-    files::Manifest,
     outputs::{ProvingKeyFile, VerificationKeyFile},
+    root::Manifest,
     source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 

leo/commands/test.rs

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

leo/commands/unload.rs

@@ -5,7 +5,7 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    files::Manifest,
+    root::Manifest,
     source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 

package/src/errors/mod.rs

@@ -1,9 +1,3 @@
-pub mod source;
-pub use self::source::*;
-
-pub mod files;
-pub use self::files::*;
-
 pub mod imports;
 pub use imports::*;
 
@@ -12,3 +6,9 @@ pub use inputs::*;
 
 pub mod outputs;
 pub use outputs::*;
+
+pub mod root;
+pub use self::root::*;
+
+pub mod source;
+pub use self::source::*;

package/src/lib.rs

@@ -4,8 +4,8 @@ extern crate thiserror;
 pub mod errors;
 pub use errors::*;
 
-pub mod files;
 pub mod imports;
 pub mod inputs;
 pub mod outputs;
+pub mod root;
 pub mod source;

package/src/root/mod.rs

@@ -1,8 +1,8 @@
-pub mod zip;
-pub use self::zip::*;
-
 pub mod gitignore;
 pub use self::gitignore::*;
 
 pub mod manifest;
 pub use self::manifest::*;
+
+pub mod zip;
+pub use self::zip::*;