Modifies Dockerfile for updated config file location

Also updates config generation test to reflect previous behavior, would be good to review if this behavior is still appropriate however. Signed-off-by: Michael Maurer <[email protected]>
mit-dci · Apr 3, 2023 · d237524 · d237524
1 parent 1a52ca9
commit d237524
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -52,7 +52,7 @@ COPY --from=builder /opt/tx-processor/scripts/test-transaction.sh ./scripts/test
 COPY --from=builder /opt/tx-processor/build/src/uhs/client/client-cli ./build/src/uhs/client/client-cli
 
 # Copy 2PC config
-COPY --from=builder /opt/tx-processor/2pc-compose.cfg ./2pc-compose.cfg
+COPY --from=builder /opt/tx-processor/config/general/2pc-compose.cfg ./config/general/2pc-compose.cfg
 
 # Create Atomizer Deployment Image
 FROM $IMAGE_VERSION AS atomizer
@@ -74,4 +74,4 @@ COPY --from=builder /opt/tx-processor/scripts/test-transaction.sh ./scripts/test
 COPY --from=builder /opt/tx-processor/build/src/uhs/client/client-cli ./build/src/uhs/client/client-cli
 
 # Copy atomizer config
-COPY --from=builder /opt/tx-processor/atomizer-compose.cfg ./atomizer-compose.cfg
+COPY --from=builder /opt/tx-processor/config/general/atomizer-compose.cfg ./config/general/atomizer-compose.cfg
diff --git a/tests/unit/config_gen_test.cpp b/tests/unit/config_gen_test.cpp
@@ -35,8 +35,9 @@ TEST_F(config_generation_validation_test,
     cbdc::generate_config::config_generator new_config_gen(
         template_file_atomizer,
         port_num);
+    testing::internal::CaptureStderr();
     auto cfg_or_err = new_config_gen.generate_configuration_file();
-    ASSERT_EQ(cfg_or_err, "SUCCESS");
+    ASSERT_NE(testing::internal::GetCapturedStderr().find("SUCCESS"), -1);
     // TODO
     // Reload generate file and check values
     // Delete generated file
@@ -49,8 +50,9 @@ TEST_F(config_generation_validation_test,
     // necessarily know which one
     cbdc::generate_config::config_generator new_config_gen(template_file_2pc,
                                                            port_num);
+    testing::internal::CaptureStderr();
     auto cfg_or_err = new_config_gen.generate_configuration_file();
-    ASSERT_EQ(cfg_or_err, "SUCCESS");
+    ASSERT_NE(testing::internal::GetCapturedStderr().find("SUCCESS"), -1);
     // TODO
     // Reload generate file and check values
     // Delete generated file

diff --git a/tools/config_generator/config_generator.cpp b/tools/config_generator/config_generator.cpp
@@ -800,7 +800,7 @@ namespace cbdc::generate_config {
             std::pair<std::string, std::string> key_pair = create_key_pair();
             set_param_to_config_file(seed_privkey, key_pair.first);
         }
-        std::cout << "SUCCESS";
+        std::cerr << "SUCCESS\n";
         return m_new_config.str();
     }
 }
diff --git a/tools/config_generator/generate_config.cpp b/tools/config_generator/generate_config.cpp
@@ -63,7 +63,7 @@ auto main(int argc, char** argv) -> int {
     }
     cbdc::generate_config::config_generator new_config_gen(args[1], port_num);
     auto cfg_or_err = new_config_gen.generate_configuration_file();
-    std::cerr << cfg_or_err << std::endl;
+    std::cout << cfg_or_err << std::endl;
     std::cout << std::endl;
     return 0;
 }