Remove nP_deprecated templates

programs/test_mpc.cpp

@@ -16,7 +16,7 @@ int main(int argc, char** argv) {
     NetIOMP *ios[2] = {&io, &io2};
     BristolFormat cf(circuit_file_location.c_str());
 
-    CMPC<nP>* mpc = new CMPC<nP>(nP, ios, party, &cf);
+    CMPC* mpc = new CMPC(nP, ios, party, &cf);
     cout <<"Setup:\t"<<party<<"\n";
 
     mpc->function_independent();

src/cpp/emp-agmpc/abitmp.h

@@ -10,7 +10,6 @@
 #include "nvec.h"
 #include "vec.h"
 
-template<int nP_deprecated>
 class ABitMP { public:
     int nP;
     Vec<std::optional<IKNP>> abit1;

src/cpp/emp-agmpc/fpremp.h

@@ -9,12 +9,12 @@
 #include "nvec.h"
 
 using namespace emp;
-template<int nP_deprecated>
+
 class FpreMP { public:
     int nP;
     int party;
     NetIOMP * io;
-    ABitMP<nP_deprecated>* abit;
+    ABitMP* abit;
     block Delta;
     CRH * prps;
     CRH * prps2;
@@ -26,7 +26,7 @@ class FpreMP { public:
         this->party = party;
         this->io = io[0];
         this ->ssp = ssp;
-        abit = new ABitMP<nP_deprecated>(nP, io[1], party, _delta, ssp);
+        abit = new ABitMP(nP, io[1], party, _delta, ssp);
         Delta = abit->Delta;
         prps = new CRH[nP+1];
         prps2 = new CRH[nP+1];

src/cpp/emp-agmpc/mpc.h

@@ -9,11 +9,10 @@
 #include <emp-tool/emp-tool.h>
 using namespace emp;
 
-template <int nP_deprecated>
 class CMPC { public:
     const static int SSP = 5;//5*8 in fact...
     const block MASK = makeBlock(0x0ULL, 0xFFFFFULL);
-    FpreMP<nP_deprecated>* fpre = nullptr;
+    FpreMP* fpre = nullptr;
 
     int nP;
 
@@ -67,7 +66,7 @@ class CMPC { public:
         }
         num_in = cf->n1+cf->n2;
         total_pre = num_in + num_ands + 3*ssp;
-        fpre = new FpreMP<nP_deprecated>(nP, io, party, _delta, ssp);
+        fpre = new FpreMP(nP, io, party, _delta, ssp);
         Delta = fpre->Delta;
 
         if(party == 1) {