dir changes

johannes67890 · Dec 8, 2022 · 8ce0b05 · 8ce0b05
1 parent 7f02308
commit 8ce0b05
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -4,9 +4,6 @@ import { secp256k1 } from "./curve/curvesDefined";
 import Header from "./frontend/Header";
 import Menu from "./frontend/Menu";
 import Keys from "./frontend/Keys";
-import { EC, Point } from "./curve/EDDSA/EC";
-import Signature, { signature } from "./curve/EDDSA/signature";
-import { BN } from "bn.js";
 
 const bob = new KeySet(secp256k1);
 const alice = new KeySet(secp256k1);

diff --git a/src/cdm.ts b/src/cdm.ts
@@ -1,4 +1,4 @@
-import { EC } from './curve/EDDSA/EC';
+import { EC } from './curve/EC';
 import KeySet from "./curve/EDDSA/keyGeneration";
 import Signature from "./curve/EDDSA/signature";
 import { secp256k1 } from './curve/curvesDefined';

diff --git a/src/curve/EDDSA/EC.test.ts → src/curve/EC.test.ts b/src/curve/EDDSA/EC.test.ts → src/curve/EC.test.ts
@@ -1,7 +1,7 @@
 import { EC } from "./EC";
 import { BN } from "bn.js";
-import { secp256k1 } from "../curvesDefined";
-import KeySet from "./keyGeneration";
+import { secp256k1 } from "./curvesDefined";
+import KeySet from "./EDDSA/keyGeneration";
 
 describe("EC", () => {
   const ec = new EC(secp256k1);

diff --git a/src/curve/EDDSA/EC.ts → src/curve/EC.ts b/src/curve/EDDSA/EC.ts → src/curve/EC.ts
@@ -1,5 +1,5 @@
 import BN from "bn.js";
-import { curveOpt } from "../curvesDefined";
+import { curveOpt } from "./curvesDefined";
 
 export interface Point {
   x: BN;

diff --git a/src/curve/EDDSA/keyGeneration.test.ts b/src/curve/EDDSA/keyGeneration.test.ts
@@ -1,4 +1,4 @@
-import { EC } from "./EC";
+import { EC } from "../EC";
 import KeySet from "./keyGeneration";
 import { secp256k1 } from "../curvesDefined";
 import { BN } from "bn.js";

diff --git a/src/curve/EDDSA/keyGeneration.ts b/src/curve/EDDSA/keyGeneration.ts
@@ -1,6 +1,6 @@
 import BN from "bn.js";
 import { randomBytes } from "crypto";
-import { EC } from "./EC";
+import { EC } from "../EC";
 import { curveOpt } from "../curvesDefined";
 
 /**

diff --git a/src/curve/EDDSA/signature.test.ts b/src/curve/EDDSA/signature.test.ts
@@ -1,5 +1,5 @@
 import { secp256k1 } from "../curvesDefined";
-import { EC } from "./EC";
+import { EC } from "../EC";
 import Signature, { signature } from "./signature";
 import KeySet from "./keyGeneration";
 import BN from "bn.js";

diff --git a/src/curve/EDDSA/signature.ts b/src/curve/EDDSA/signature.ts
@@ -1,7 +1,7 @@
 import BN from "bn.js";
 import { randomBytes } from "crypto";
-import { Point } from "./EC";
-import { EC } from "./EC";
+import { Point } from "../EC";
+import { EC } from "../EC";
 import { hashMsgSHA256 } from "../../util";
 
 export interface signature {

diff --git a/src/curve/curvesDefined.ts b/src/curve/curvesDefined.ts
@@ -1,4 +1,5 @@
 import { sha256 } from "hash.js";
+
 export interface curveOpt {
   name: string; // Name of the curve
   prime: string; // modulo prime number p