Add source directory in package

leo/commands/build.rs

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

leo/commands/deploy.rs

@@ -5,8 +5,8 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    directories::SOURCE_DIRECTORY_NAME,
-    files::{Manifest, MAIN_FILE_NAME},
+    files::Manifest,
+    source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 
 use clap::ArgMatches;

leo/commands/init.rs

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

leo/commands/lint.rs

@@ -5,8 +5,8 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    directories::SOURCE_DIRECTORY_NAME,
-    files::{Manifest, MAIN_FILE_NAME},
+    files::Manifest,
+    source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 
 use clap::ArgMatches;

leo/commands/load.rs

@@ -5,8 +5,8 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    directories::SOURCE_DIRECTORY_NAME,
-    files::{Manifest, MAIN_FILE_NAME},
+    files::Manifest,
+    source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 
 use clap::ArgMatches;

leo/commands/new.rs

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

leo/commands/setup.rs

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

leo/commands/test.rs

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

leo/commands/unload.rs

@@ -5,8 +5,8 @@ use crate::{
     errors::{CLIError, RunError},
 };
 use leo_package::{
-    directories::SOURCE_DIRECTORY_NAME,
-    files::{Manifest, MAIN_FILE_NAME},
+    files::Manifest,
+    source::{MAIN_FILE_NAME, SOURCE_DIRECTORY_NAME},
 };
 
 use clap::ArgMatches;

package/src/directories/mod.rs

@@ -1,2 +0,0 @@
-pub mod source;
-pub use self::source::*;

package/src/errors/directory/mod.rs

@@ -1,2 +0,0 @@
-pub mod source;
-pub use self::source::*;

package/src/errors/files/mod.rs

@@ -4,11 +4,5 @@ pub use self::zip::*;
 pub mod gitignore;
 pub use self::gitignore::*;
 
-pub mod lib;
-pub use self::lib::*;
-
-pub mod main;
-pub use self::main::*;
-
 pub mod manifest;
 pub use self::manifest::*;

package/src/errors/mod.rs

@@ -1,5 +1,5 @@
-pub mod directory;
-pub use self::directory::*;
+pub mod source;
+pub use self::source::*;
 
 pub mod files;
 pub use self::files::*;

package/src/errors/source/mod.rs

@@ -0,0 +1,8 @@
+pub mod directory;
+pub use directory::*;
+
+pub mod lib;
+pub use lib::*;
+
+pub mod main;
+pub use main::*;

package/src/files/mod.rs

@@ -1,12 +1,6 @@
 pub mod gitignore;
 pub use self::gitignore::*;
 
-pub mod lib;
-pub use self::lib::*;
-
-pub mod main;
-pub use self::main::*;
-
 pub mod manifest;
 pub use self::manifest::*;
 

package/src/lib.rs

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

package/src/source/lib.rs

@@ -1,6 +1,6 @@
 //! The `lib.leo` file.
 
-use crate::{directories::source::SOURCE_DIRECTORY_NAME, errors::LibFileError};
+use crate::{errors::LibFileError, source::directory::SOURCE_DIRECTORY_NAME};
 
 use serde::Deserialize;
 use std::{fs::File, io::Write, path::PathBuf};

package/src/source/main.rs

@@ -1,6 +1,6 @@
 //! The `main.leo` file.
 
-use crate::{directories::source::SOURCE_DIRECTORY_NAME, errors::MainFileError};
+use crate::{errors::MainFileError, source::directory::SOURCE_DIRECTORY_NAME};
 
 use serde::Deserialize;
 use std::{fs::File, io::Write, path::PathBuf};

package/src/source/mod.rs

@@ -0,0 +1,8 @@
+pub mod directory;
+pub use directory::*;
+
+pub mod lib;
+pub use lib::*;
+
+pub mod main;
+pub use main::*;