update C# sample

1 files changed, 28 insertions, 33 deletions

diff --git a/ffi/cs/bls256_test.cs b/ffi/cs/bls256_test.cs
index 2eace18..989993e 100644
--- a/ffi/cs/bls256_test.cs
+++ b/ffi/cs/bls256_test.cs
@@ -14,53 +14,48 @@ namespace mcl {
 		{
 			Console.WriteLine("TestId");
 			Id id = new Id();
-			id.SetStr("255", 10);
-			assert("GetStr(10)", id.GetStr(10) == "255");
-			assert("GetStr(16)", id.GetStr(16) == "ff");
-			id.SetArray(new ulong[] { 1, 2, 3, 4 });
-			assert("GetStr(16)", id.GetStr(16) == "4000000000000000300000000000000020000000000000001");
+			id.SetDecStr("255");
+			assert("GetStr(10)", id.GetDecStr() == "255");
+			assert("GetStr(16)", id.GetHexStr() == "ff");
 		}
 		static void TestSecretKey()
 		{
 			Console.WriteLine("TestSecretKey");
 			SecretKey sec = new SecretKey();
-			sec.SetStr("255", 10);
-			assert("GetStr(10)", sec.GetStr(10) == "255");
-			assert("GetStr(16)", sec.GetStr(16) == "ff");
-			sec.SetArray(new ulong[] { 1, 2, 3, 4 });
-			assert("GetStr(16)", sec.GetStr(16) == "4000000000000000300000000000000020000000000000001");
+			sec.SetHexStr("ff");
+			assert("GetHexStr()", sec.GetHexStr() == "ff");
 			{
 				SecretKey sec2 = new SecretKey();
-				sec.SetStr("321", 10);
-				sec2.SetStr("4000", 10);
+				sec.SetHexStr("321");
+				sec2.SetHexStr("4000");
 				sec.Add(sec2);
-				assert("sec.Add", sec.GetStr(10) == "4321");
-				sec.Init();
-				Console.WriteLine("sec.Init={0}", sec);
+				assert("sec.Add", sec.GetHexStr() == "4321");
+				sec.SetByCSPRNG();
+				Console.WriteLine("sec.Init={0}", sec.GetHexStr());
 			}
 		}
 		static void TestPublicKey()
 		{
 			Console.WriteLine("TestPublicKey");
 			SecretKey sec = new SecretKey();
-			sec.Init();
+			sec.SetByCSPRNG();
 			PublicKey pub = sec.GetPublicKey();
-			String sign = pub.ToString();
-			Console.WriteLine("pub={0}", sign);
+			String s = pub.GetHexStr();
+			Console.WriteLine("pub={0}", s);
 			PublicKey pub2 = new PublicKey();
-			pub2.SetStr(sign);
-			assert("pub.SetStr", pub.IsSame(pub2));
+			pub2.SetStr(s);
+			assert("pub.SetStr", pub.IsEqual(pub2));
 		}
 		static void TestSign()
 		{
 			Console.WriteLine("TestSign");
 			SecretKey sec = new SecretKey();
-			sec.Init();
+			sec.SetByCSPRNG();
 			PublicKey pub = sec.GetPublicKey();
 			String m = "abc";
-			Sign sign = sec.Sign(m);
-			assert("verify", pub.Verify(sign, m));
-			assert("not verify", !pub.Verify(sign, m + "a"));
+			Signature sig = sec.Signature(m);
+			assert("verify", pub.Verify(sig, m));
+			assert("not verify", !pub.Verify(sig, m + "a"));
 		}
 		static void TestSharing()
 		{
@@ -70,7 +65,7 @@ namespace mcl {
 			PublicKey[] mpk = new PublicKey[k];
 			// make master secretkey
 			for (int i = 0; i < k; i++) {
-				msk[i].Init();
+				msk[i].SetByCSPRNG();
 				mpk[i] = msk[i].GetPublicKey();
 			}
 			int n = 30;
@@ -81,12 +76,12 @@ namespace mcl {
 				ids[i].SetInt(i * i + 123);
 				secs[i] = ShareSecretKey(msk, ids[i]);
 				pubs[i] = SharePublicKey(mpk, ids[i]);
-				assert("share publicKey", secs[i].GetPublicKey().IsSame(pubs[i]));
+				assert("share publicKey", secs[i].GetPublicKey().IsEqual(pubs[i]));
 			}
 			string m = "doremi";
 			for (int i = 0; i < n; i++) {
-				Sign sign = secs[i].Sign(m);
-				assert("sign.Verify", pubs[i].Verify(sign, m));
+				Signature Signature = secs[i].Signature(m);
+				assert("Signature.Verify", pubs[i].Verify(Signature, m));
 			}
 			{
 				int[] idxTbl = { 0, 2, 5, 8, 10 };
@@ -94,19 +89,19 @@ namespace mcl {
 				Id[] subIds = new Id[k];
 				SecretKey[] subSecs = new SecretKey[k];
 				PublicKey[] subPubs = new PublicKey[k];
-				Sign[] subSigns = new Sign[k];
+				Signature[] subSigns = new Signature[k];
 				for (int i = 0; i < k; i++) {
 					int idx = idxTbl[i];
 					subIds[i] = ids[idx];
 					subSecs[i] = secs[idx];
 					subPubs[i] = pubs[idx];
-					subSigns[i] = secs[idx].Sign(m);
+					subSigns[i] = secs[idx].Signature(m);
 				}
 				SecretKey sec = RecoverSecretKey(subSecs, subIds);
 				PublicKey pub = RecoverPublicKey(subPubs, subIds);
-				assert("check pub", pub.IsSame(sec.GetPublicKey()));
-				Sign sign = RecoverSign(subSigns, subIds);
-				assert("sign.verify", pub.Verify(sign, m));
+				assert("check pub", pub.IsEqual(sec.GetPublicKey()));
+				Signature Signature = RecoverSign(subSigns, subIds);
+				assert("Signature.verify", pub.Verify(Signature, m));
 			}
 		}
 		static void Main(string[] args)