[FOLD] Fix merge conflicts

gregtatcam · Feb 8, 2024 · bf6f529 · bf6f529
1 parent e9dd565
commit bf6f529
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
@@ -22,6 +22,8 @@
 
 namespace ripple {
 namespace test {
+namespace jtx {
+namespace oracle {
 
 struct Oracle_test : public beast::unit_test::suite
 {
@@ -687,6 +689,10 @@ struct Oracle_test : public beast::unit_test::suite
 
 BEAST_DEFINE_TESTSUITE(Oracle, app, ripple);
 
+}  // namespace oracle
+
+}  // namespace jtx
+
 }  // namespace test
 
 }  // namespace ripple
diff --git a/src/test/jtx/Oracle.h b/src/test/jtx/Oracle.h
@@ -26,6 +26,7 @@
 namespace ripple {
 namespace test {
 namespace jtx {
+namespace oracle {
 
 // base asset, quote asset, price, scale
 using DataSeries = std::vector<std::tuple<
@@ -177,6 +178,7 @@ class Oracle
     }
 };
 
+}  // namespace oracle
 }  // namespace jtx
 }  // namespace test
 }  // namespace ripple

diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp
@@ -28,6 +28,7 @@
 namespace ripple {
 namespace test {
 namespace jtx {
+namespace oracle {
 
 Oracle::Oracle(Env& env, CreateArg const& arg, bool submit)
     : env_(env), owner_{}, documentID_{}
@@ -285,6 +286,7 @@ Oracle::ledgerEntry(
     return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 }
 
+}  // namespace oracle
 }  // namespace jtx
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -24,6 +24,8 @@
 
 namespace ripple {
 namespace test {
+namespace jtx {
+namespace oracle {
 
 class GetAggregatePrice_test : public beast::unit_test::suite
 {
@@ -252,5 +254,7 @@ class GetAggregatePrice_test : public beast::unit_test::suite
 
 BEAST_DEFINE_TESTSUITE(GetAggregatePrice, app, ripple);
 
+}  // namespace oracle
+}  // namespace jtx
 }  // namespace test
 }  // namespace ripple