Change output location of smallbank_workload protobuf generation

Signed-off-by: Bridger Herman <[email protected]>

.gitignore

@@ -101,7 +101,6 @@
 /perf/sawtooth_perf/target/
 /perf/sawtooth_workload/Cargo.lock
 /perf/sawtooth_workload/target/
-/perf/smallbank_workload/src/smallbank.rs
 /perf/smallbank_workload/Cargo.lock
 /perf/smallbank_workload/target/
 /perf/smallbank_workload/bin/

perf/smallbank_workload/build.rs

@@ -20,21 +20,53 @@ extern crate protoc_rust;
 
 use protoc_rust::Customize;
 
+use std::env;
+use std::fs;
+use std::fs::File;
+use std::io::Write;
+use std::path::Path;
+
 fn main() {
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let dest_path = Path::new(&out_dir).join("protos");
+    fs::create_dir_all(&dest_path).unwrap();
+
     let proto_src_files = glob_simple("../../families/smallbank/protos/*.proto");
     println!("{:?}", proto_src_files);
 
     protoc_rust::run(protoc_rust::Args {
-        out_dir: "./src",
+        out_dir: &dest_path.to_str().unwrap(),
         input: &proto_src_files
             .iter()
-            .map(|a| a.as_ref())
+            .map(|proto_file| proto_file.as_ref())
             .collect::<Vec<&str>>(),
         includes: &["../../families/smallbank/protos"],
         customize: Customize {
             ..Default::default()
         },
     }).expect("Error generating rust files from smallbank protos");
+
+    // Create mod.rs accordingly
+    let mod_file_content = proto_src_files
+        .iter()
+        .map(|proto_file| {
+            let proto_path = Path::new(proto_file);
+            format!(
+                "pub mod {};",
+                proto_path
+                    .file_stem()
+                    .expect("Unable to extract stem")
+                    .to_str()
+                    .expect("Unable to extract filename")
+            )
+        })
+        .collect::<Vec<_>>()
+        .join("\n");
+
+    let mut mod_file = File::create(dest_path.join("mod.rs")).unwrap();
+    mod_file
+        .write_all(mod_file_content.as_bytes())
+        .expect("Unable to write mod file");
 }
 
 fn glob_simple(pattern: &str) -> Vec<String> {

perf/smallbank_workload/src/main.rs

@@ -23,7 +23,7 @@ extern crate sawtooth_perf;
 extern crate sawtooth_sdk;
 
 mod playlist;
-mod smallbank;
+mod protos;
 mod smallbank_transformer;
 
 use std::error::Error;

perf/smallbank_workload/src/playlist.rs

@@ -38,9 +38,9 @@ use self::yaml_rust::Yaml;
 use self::yaml_rust::YamlEmitter;
 use self::yaml_rust::YamlLoader;
 
-use smallbank;
-use smallbank::SmallbankTransactionPayload;
-use smallbank::SmallbankTransactionPayload_PayloadType as SBPayloadType;
+use protos::smallbank;
+use protos::smallbank::SmallbankTransactionPayload;
+use protos::smallbank::SmallbankTransactionPayload_PayloadType as SBPayloadType;
 
 use protobuf;
 use protobuf::Message;

perf/smallbank_workload/src/protos.rs

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018 Bitwise IO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -----------------------------------------------------------------------------
+ */
+
+// Includes the autogenerated protobuf messages
+include!(concat!(env!("OUT_DIR"), "/protos/mod.rs"));

perf/smallbank_workload/src/smallbank_transformer.rs

@@ -31,7 +31,7 @@ use sawtooth_sdk::signing;
 
 use playlist::bytes_to_hex_str;
 use playlist::make_addresses;
-use smallbank::{SmallbankTransactionPayload, SmallbankTransactionPayload_PayloadType};
+use protos::smallbank::{SmallbankTransactionPayload, SmallbankTransactionPayload_PayloadType};
 
 /// Transforms SmallbankTransactionPayloads into Sawtooth Transactions.
 pub struct SBPayloadTransformer<'a> {