Migrate files to an inputs directory in package

leo/commands/build.rs

@@ -2,7 +2,8 @@ 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, OutputDirectory, OUTPUT_DIRECTORY_NAME},
-    files::{ChecksumFile, InputFile, LibFile, MainFile, Manifest, StateFile, LIB_FILE_NAME, MAIN_FILE_NAME},
+    files::{ChecksumFile, LibFile, MainFile, Manifest, LIB_FILE_NAME, MAIN_FILE_NAME},
+    inputs::*,
 };
 
 use snarkos_algorithms::snark::groth16::KeypairAssembly;

leo/commands/init.rs

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

leo/commands/new.rs

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

leo/commands/test.rs

@@ -6,7 +6,8 @@ use crate::{
 use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType};
 use leo_package::{
     directories::{output::OUTPUT_DIRECTORY_NAME, source::SOURCE_DIRECTORY_NAME},
-    files::{InputFile, MainFile, Manifest, StateFile, MAIN_FILE_NAME},
+    files::{MainFile, Manifest, MAIN_FILE_NAME},
+    inputs::*,
 };
 
 use snarkos_curves::edwards_bls12::Fq;

package/src/directories/mod.rs

@@ -1,9 +1,6 @@
 pub mod imports;
 pub use self::imports::*;
 
-pub mod input;
-pub use self::input::*;
-
 pub mod output;
 pub use self::output::*;
 

package/src/errors/directory/mod.rs

@@ -1,9 +1,6 @@
 pub mod imports;
 pub use self::imports::*;
 
-pub mod input;
-pub use self::input::*;
-
 pub mod output;
 pub use self::output::*;
 

package/src/errors/files/mod.rs

@@ -7,9 +7,6 @@ pub use self::checksum::*;
 pub mod gitignore;
 pub use self::gitignore::*;
 
-pub mod input;
-pub use self::input::*;
-
 pub mod lib;
 pub use self::lib::*;
 
@@ -25,8 +22,5 @@ pub use self::proof::*;
 pub mod proving_key;
 pub use self::proving_key::*;
 
-pub mod state;
-pub use self::state::*;
-
 pub mod verification_key;
 pub use self::verification_key::*;

package/src/errors/inputs/mod.rs

@@ -0,0 +1,8 @@
+pub mod directory;
+pub use directory::*;
+
+pub mod input;
+pub use input::*;
+
+pub mod state;
+pub use state::*;

package/src/errors/mod.rs

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

package/src/files/mod.rs

@@ -4,9 +4,6 @@ pub use self::zip::*;
 pub mod checksum;
 pub use self::checksum::*;
 
-pub mod input;
-pub use self::input::*;
-
 pub mod gitignore;
 pub use self::gitignore::*;
 
@@ -25,8 +22,5 @@ pub use self::proof::*;
 pub mod proving_key;
 pub use self::proving_key::*;
 
-pub mod state;
-pub use self::state::*;
-
 pub mod verification_key;
 pub use self::verification_key::*;

package/src/files/zip.rs

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

package/src/inputs/input.rs

@@ -1,6 +1,6 @@
 //! The `program.in` file.
 
-use crate::{directories::input::INPUT_DIRECTORY_NAME, errors::InputFileError};
+use crate::{errors::InputFileError, inputs::INPUT_DIRECTORY_NAME};
 
 use serde::Deserialize;
 use std::{

package/src/inputs/mod.rs

@@ -0,0 +1,8 @@
+pub mod directory;
+pub use directory::*;
+
+pub mod input;
+pub use input::*;
+
+pub mod state;
+pub use state::*;

package/src/inputs/state.rs

@@ -1,6 +1,6 @@
 //! The `program.state` file.
 
-use crate::{directories::input::INPUT_DIRECTORY_NAME, errors::StateFileError};
+use crate::{errors::StateFileError, inputs::INPUT_DIRECTORY_NAME};
 
 use serde::Deserialize;
 use std::{

package/src/lib.rs

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