From 0b5bd78e37945a9927b330d703f845a9d9a6bd09 Mon Sep 17 00:00:00 2001
From: Dmitriy Suponitskiy <dsuponitskiy@dualitytech.com>
Date: Wed, 2 Aug 2023 15:50:23 -0400
Subject: [PATCH] Renamed files with code with params to generate cryptocontext

---
 src/pke/examples/README.md                                  | 2 +-
 .../include/scheme/bfvrns/gen-cryptocontext-bfvrns-params.h | 2 +-
 .../include/scheme/bgvrns/gen-cryptocontext-bgvrns-params.h | 2 +-
 .../scheme/ckksrns/gen-cryptocontext-ckksrns-params.h       | 2 +-
 ...arams-defaults.h => gen-cryptocontext-params-defaults.h} | 6 +++---
 ...ryptocontextparams-base.h => gen-cryptocontext-params.h} | 6 +++---
 ...rams-base-impl.cpp => gen-cryptocontext-params-impl.cpp} | 4 ++--
 src/pke/unittest/utils/BaseTestCase.h                       | 2 +-
 src/pke/unittest/utils/UnitTestReadCSVData.cpp              | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename src/pke/include/scheme/{cryptocontextparams-defaults.h => gen-cryptocontext-params-defaults.h} (98%)
 rename src/pke/include/scheme/{cryptocontextparams-base.h => gen-cryptocontext-params.h} (99%)
 rename src/pke/lib/scheme/{cryptocontextparams-base-impl.cpp => gen-cryptocontext-params-impl.cpp} (99%)

diff --git a/src/pke/examples/README.md b/src/pke/examples/README.md
index 962c262bf..03e6d0746 100644
--- a/src/pke/examples/README.md
+++ b/src/pke/examples/README.md
@@ -113,7 +113,7 @@ Now your code should look like this:
 ## Description of the CryptoContext parameters
 Choosing the CryptoContext parameters is important for obtaining the best performance for your encrypted application, while maintaining the desired level of security. We strongly recommend that you specify the security level and have OpenFHE automatically select the other parameters, unless you are an expert in homomorphic encryption. If you would like to modify the parameters to understand how they affect noise growth and performance, we provide descriptions below.
 
-The default values for all the parameters can be found in [cryptocontextparams-defaults.h](../include/scheme/cryptocontextparams-defaults.h)
+The default values for all the parameters can be found in [gen-cryptocontext-params-defaults.h](../include/scheme/gen-cryptocontext-params-defaults.h)
 
 **PlaintextModulus ptModulus** - plaintext modulus(for BGV/BFV), which impacts noise growth
 
diff --git a/src/pke/include/scheme/bfvrns/gen-cryptocontext-bfvrns-params.h b/src/pke/include/scheme/bfvrns/gen-cryptocontext-bfvrns-params.h
index 7b5d65053..8295f8f5e 100644
--- a/src/pke/include/scheme/bfvrns/gen-cryptocontext-bfvrns-params.h
+++ b/src/pke/include/scheme/bfvrns/gen-cryptocontext-bfvrns-params.h
@@ -36,7 +36,7 @@
 #ifndef __GEN_CRYPTOCONTEXT_BFVRNS_PARAMS_H__
 #define __GEN_CRYPTOCONTEXT_BFVRNS_PARAMS_H__
 
-#include "scheme/cryptocontextparams-base.h"
+#include "scheme/gen-cryptocontext-params.h"
 
 #include <string>
 #include <vector>
diff --git a/src/pke/include/scheme/bgvrns/gen-cryptocontext-bgvrns-params.h b/src/pke/include/scheme/bgvrns/gen-cryptocontext-bgvrns-params.h
index 851b8ddf3..20eeb3639 100644
--- a/src/pke/include/scheme/bgvrns/gen-cryptocontext-bgvrns-params.h
+++ b/src/pke/include/scheme/bgvrns/gen-cryptocontext-bgvrns-params.h
@@ -36,7 +36,7 @@
 #ifndef __GEN_CRYPTOCONTEXT_BGVRNS_PARAMS_H__
 #define __GEN_CRYPTOCONTEXT_BGVRNS_PARAMS_H__
 
-#include "scheme/cryptocontextparams-base.h"
+#include "scheme/gen-cryptocontext-params.h"
 
 #include <string>
 #include <vector>
diff --git a/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-params.h b/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-params.h
index 000a7a030..eb057de34 100644
--- a/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-params.h
+++ b/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-params.h
@@ -36,7 +36,7 @@
 #ifndef __GEN_CRYPTOCONTEXT_CKKSRNS_PARAMS_H__
 #define __GEN_CRYPTOCONTEXT_CKKSRNS_PARAMS_H__
 
-#include "scheme/cryptocontextparams-base.h"
+#include "scheme/gen-cryptocontext-params.h"
 
 #include <string>
 #include <vector>
diff --git a/src/pke/include/scheme/cryptocontextparams-defaults.h b/src/pke/include/scheme/gen-cryptocontext-params-defaults.h
similarity index 98%
rename from src/pke/include/scheme/cryptocontextparams-defaults.h
rename to src/pke/include/scheme/gen-cryptocontext-params-defaults.h
index afe0d4a85..81d6b468f 100644
--- a/src/pke/include/scheme/cryptocontextparams-defaults.h
+++ b/src/pke/include/scheme/gen-cryptocontext-params-defaults.h
@@ -33,8 +33,8 @@
   Collection of parameter default values for different schemes
  */
 
-#ifndef _CRYPTOCONTEXTPARAMS_DEFAULTS_H_
-#define _CRYPTOCONTEXTPARAMS_DEFAULTS_H_
+#ifndef __GEN_CRYPTOCONTEXT_PARAMS_DEFAULTS_H__
+#define __GEN_CRYPTOCONTEXT_PARAMS_DEFAULTS_H__
 
 #include "lattice/stdlatticeparms.h"  // SecurityLevel
 #include "scheme/scheme-id.h"         // SCHEME
@@ -161,4 +161,4 @@ constexpr COMPRESSION_LEVEL interactiveBootCompressionLevel = SLACK;
 
 }  // namespace lbcrypto
 
-#endif  // _CRYPTOCONTEXTPARAMS_DEFAULTS_H_
+#endif  // __GEN_CRYPTOCONTEXT_PARAMS_DEFAULTS_H__
diff --git a/src/pke/include/scheme/cryptocontextparams-base.h b/src/pke/include/scheme/gen-cryptocontext-params.h
similarity index 99%
rename from src/pke/include/scheme/cryptocontextparams-base.h
rename to src/pke/include/scheme/gen-cryptocontext-params.h
index f0b15e4eb..bc40400f1 100644
--- a/src/pke/include/scheme/cryptocontextparams-base.h
+++ b/src/pke/include/scheme/gen-cryptocontext-params.h
@@ -33,8 +33,8 @@
   Scheme parameter default class
  */
 
-#ifndef _CRYPTOCONTEXTPARAMS_BASE_H_
-#define _CRYPTOCONTEXTPARAMS_BASE_H_
+#ifndef __GEN_CRYPTOCONTEXT_PARAMS_H__
+#define __GEN_CRYPTOCONTEXT_PARAMS_H__
 
 // Had to include cryptocontext.h as the includes below give a compiler error.
 // Those headers probably depend on some order/sequence.
@@ -426,4 +426,4 @@ class Params {
 
 }  // namespace lbcrypto
 
-#endif  // _CRYPTOCONTEXTPARAMS_BASE_H_
+#endif  // __GEN_CRYPTOCONTEXT_PARAMS_H__
diff --git a/src/pke/lib/scheme/cryptocontextparams-base-impl.cpp b/src/pke/lib/scheme/gen-cryptocontext-params-impl.cpp
similarity index 99%
rename from src/pke/lib/scheme/cryptocontextparams-base-impl.cpp
rename to src/pke/lib/scheme/gen-cryptocontext-params-impl.cpp
index 49a16d8b9..e106ae9aa 100644
--- a/src/pke/lib/scheme/cryptocontextparams-base-impl.cpp
+++ b/src/pke/lib/scheme/gen-cryptocontext-params-impl.cpp
@@ -33,8 +33,8 @@
   Definitions for scheme parameter default class
  */
 
-#include "scheme/cryptocontextparams-base.h"
-#include "scheme/cryptocontextparams-defaults.h"
+#include "scheme/gen-cryptocontext-params.h"
+#include "scheme/gen-cryptocontext-params-defaults.h"
 #include "utils/exception.h"
 
 #include <string>
diff --git a/src/pke/unittest/utils/BaseTestCase.h b/src/pke/unittest/utils/BaseTestCase.h
index 483dd0953..ac3c31167 100644
--- a/src/pke/unittest/utils/BaseTestCase.h
+++ b/src/pke/unittest/utils/BaseTestCase.h
@@ -35,7 +35,7 @@
 #include "scheme/ckksrns/gen-cryptocontext-ckksrns.h"
 #include "scheme/bfvrns/gen-cryptocontext-bfvrns.h"
 #include "scheme/bgvrns/gen-cryptocontext-bgvrns.h"
-#include "scheme/cryptocontextparams-base.h"
+#include "scheme/gen-cryptocontext-params.h"
 
 #include "utils/exception.h"
 
diff --git a/src/pke/unittest/utils/UnitTestReadCSVData.cpp b/src/pke/unittest/utils/UnitTestReadCSVData.cpp
index 6f7c1cd82..e23d450b8 100644
--- a/src/pke/unittest/utils/UnitTestReadCSVData.cpp
+++ b/src/pke/unittest/utils/UnitTestReadCSVData.cpp
@@ -30,7 +30,7 @@
 //==================================================================================
 #include "UnitTestReadCSVData.h"
 
-#include "scheme/cryptocontextparams-base.h"
+#include "scheme/gen-cryptocontext-params.h"
 #include "utils/exception.h"
 
 #include <fstream>