From bf6827de10fe54a7e05857d0f219dffb67cd2d54 Mon Sep 17 00:00:00 2001
From: Masato Imai <mi.imai8080@gmail.com>
Date: Fri, 26 Aug 2022 13:41:25 +0900
Subject: [PATCH] devide bin and lib

---
 Cargo.toml              | 12 +++++++++++-
 client2.gpsl            |  2 +-
 src/args.rs             |  2 +-
 src/{main.rs => bin.rs} | 13 +++----------
 src/lib.rs              |  7 +++++++
 src/test_main.rs        | 11 ++++++++---
 6 files changed, 31 insertions(+), 16 deletions(-)
 rename src/{main.rs => bin.rs} (68%)
 create mode 100644 src/lib.rs

diff --git a/Cargo.toml b/Cargo.toml
index c1ba0db..68f4a81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,17 @@ name = "encrypt"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "encrypt"
+path = "src/lib.rs"
+
+[[bin]]
+name = "encrypt"
+path = "src/bin.rs"
+
+[[bin]]
+name = "elliptic-test"
+path = "src/test_main.rs"
 
 [dependencies]
 bigdecimal = "0.3.0"
diff --git a/client2.gpsl b/client2.gpsl
index 6cbc93a..108b989 100644
--- a/client2.gpsl
+++ b/client2.gpsl
@@ -1,5 +1,5 @@
 fn main() {
-    let a = encrypt(3);
+    let a = encrypt(1);
     let b = encrypt2(2);
     println(decrypt_pair(a * b));
 }
diff --git a/src/args.rs b/src/args.rs
index d5421a6..4799875 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -18,6 +18,6 @@ pub struct Args {
     #[clap(short, long, takes_value = false)]
     pub compile: bool,
 
-    #[clap(short, long, value_parser)]
+    #[clap(short = 'e', long, value_parser)]
     pub curve: Option<String>,
 }
diff --git a/src/main.rs b/src/bin.rs
similarity index 68%
rename from src/main.rs
rename to src/bin.rs
index eefc386..7be7c12 100644
--- a/src/main.rs
+++ b/src/bin.rs
@@ -1,14 +1,7 @@
-mod args;
-mod client;
-mod common;
-mod config;
-mod elliptic_curve;
-mod gpsl;
-mod server;
-use args::Args;
 use clap::Parser;
-use client::start_client;
-use server::start_server;
+use encryptlib::args::Args;
+use encryptlib::client::start_client;
+use encryptlib::server::start_server;
 use std::env;
 
 fn main() {
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..a7f9ccb
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,7 @@
+pub mod args;
+pub mod client;
+pub mod common;
+pub mod config;
+pub mod elliptic_curve;
+pub mod gpsl;
+pub mod server;
diff --git a/src/test_main.rs b/src/test_main.rs
index 309c41e..8bf69d2 100644
--- a/src/test_main.rs
+++ b/src/test_main.rs
@@ -5,7 +5,12 @@
 [Mod(4767914906170010398, 6139062703770505681), Mod(2445476831433994309, 6139062703770505681)]]]
  */
 
-fn o_main() {
+use encrypt::{
+    common::finite_field::FiniteFieldElement, elliptic_curve::elliptic_curve::EllipticCurvePoint,
+};
+use primitive_types::U512;
+
+fn main() {
     let p = U512::from_str_radix("1009", 10).unwrap();
 
     let secp256_k1_a = FiniteFieldElement::new(U512::from(37u8), p);
@@ -45,8 +50,8 @@ fn o_main() {
     let ra = U512::from_str_radix("20", 10).unwrap();
     let rad = U512::from_str_radix("26", 10).unwrap();
 
-    let m = U512::from_str_radix("2", 10).unwrap();
-    let md = U512::from_str_radix("2", 10).unwrap();
+    let m = U512::from_str_radix("1", 10).unwrap();
+    let md = U512::from_str_radix("0", 10).unwrap();
 
     let s1 = pp * m + q * ra;
     let t1 = pp * ra;