chore: move SHA3.ts into 'api/sha' module

iluxonchik · Dec 31, 2023 · 5cd7430 · 5cd7430
1 parent d6cb8c0
commit 5cd7430
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/contracts/src/api/proofs/ZKExactGeolocationMetadataCircuitProof.ts b/contracts/src/api/proofs/ZKExactGeolocationMetadataCircuitProof.ts
@@ -5,7 +5,7 @@ import { IO1JSProof } from "./Types";
 import type { ZKGeoPoint } from "../models/ZKGeoPoint";
 import { MetadataGeoPointCommitment } from "../../model/public/Commitment";
 import { ExactGeolocationMetadataCircuitProof } from "../../zkprogram/public/Metadata";
-import { SHA3_512 } from "../../model/public/SHA3";
+import { SHA3_512 } from "../sha3/SHA3";
 
 /**
  * Abstraction over the Zero-Knowledge proof of an exact GeoPoint with associated metadata.

diff --git a/contracts/src/api/provers/ZKGeoPointProver.ts b/contracts/src/api/provers/ZKGeoPointProver.ts
@@ -13,7 +13,7 @@ import { ExactGeoPointCircuit, ExactGeoPointCircuitProof } from "../../zkprogram
 import { ZKGeoPointProviderCircuitProof } from "../proofs/ZKGeoPointProviderCircuitProof";
 import { ZKExactGeolocationMetadataCircuitProof } from "../proofs/ZKExactGeolocationMetadataCircuitProof";
 import { ExactGeolocationMetadataCircuit, ExactGeolocationMetadataCircuitProof } from "../../zkprogram/public/Metadata";
-import { Bytes64, SHA3_512 } from "../../model/public/SHA3";
+import { Bytes64, SHA3_512 } from "../sha3/SHA3";
 
 export type ZKGeoPointConstructor = new (...args: any[]) => ZKGeoPoint;
 

diff --git a/contracts/src/model/public/SHA3.ts → contracts/src/api/sha3/SHA3.ts b/contracts/src/model/public/SHA3.ts → contracts/src/api/sha3/SHA3.ts
diff --git a/contracts/src/logic/public/ExactGeoPoint.ts b/contracts/src/logic/public/ExactGeoPoint.ts
@@ -2,7 +2,7 @@ import { Field, Poseidon } from "o1js";
 import { GeoPoint } from "../../model/Geography";
 import { GeoPointCommitment, MetadataGeoPointCommitment } from "../../model/public/Commitment";
 import { GeoPointProviderCircuitProof } from "../../zkprogram/private/Geography";
-import { Bytes64, SHA3_512 } from "../../model/public/SHA3";
+import { Bytes64, SHA3_512 } from "../../api/sha3/SHA3";
 
 
 /*

diff --git a/contracts/src/tests/SHA3_512.test.ts b/contracts/src/tests/SHA3_512.test.ts
@@ -1,4 +1,4 @@
-import { SHA3_512 } from "../model/public/SHA3";
+import { SHA3_512 } from "../api/sha3/SHA3";
 
 describe('SHA3_512 Class Tests', () => {
     // Test for initialization and correct hashing

diff --git a/contracts/src/zkprogram/public/Metadata.ts b/contracts/src/zkprogram/public/Metadata.ts
@@ -2,7 +2,7 @@ import { ZkProgram } from "o1js";
 import { MetadataGeoPointCommitment } from "../../model/public/Commitment";
 import { GeoPointProviderCircuitProof } from "../private/Geography";
 import { attachMetadataToGeoPoint} from "../../logic/public/ExactGeoPoint";
-import { SHA3_512 } from "../../model/public/SHA3";
+import { SHA3_512 } from "../../api/sha3/SHA3";
 
 // TODO | IMPORTANT //
 // Add a method to ExactGeolocationMetadataCircuit that takes two recursive proofs as inputs: