fix: hasher name should not include field

filecoin-project · Mar 9, 2022 · e769deb · e769deb
1 parent 78fd2c2
commit e769deb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/filecoin-hashers/src/blake2s.rs b/filecoin-hashers/src/blake2s.rs
@@ -498,6 +498,9 @@ impl Hasher for Blake2sHasher<Fr> {
     type Domain = Blake2sDomain<Fr>;
     type Function = Blake2sFunction<Fr>;
 
+    // The hasher name should be the same for all fields. The hasher name is used to name the SDR
+    // parent-cache; graph parent generation is not affected by a hasher's field, thus the field
+    // name should not be included in the hasher name.
     fn name() -> String {
         "Blake2sHasher".into()
     }
@@ -507,14 +510,14 @@ impl Hasher for Blake2sHasher<Fp> {
     type Function = Blake2sFunction<Fp>;
 
     fn name() -> String {
-        "Blake2sHasher_pallas".into()
+        "Blake2sHasher".into()
     }
 }
 impl Hasher for Blake2sHasher<Fq> {
     type Domain = Blake2sDomain<Fq>;
     type Function = Blake2sFunction<Fq>;
 
     fn name() -> String {
-        "Blake2sHasher_vesta".into()
+        "Blake2sHasher".into()
     }
 }
diff --git a/filecoin-hashers/src/poseidon.rs b/filecoin-hashers/src/poseidon.rs
@@ -610,6 +610,9 @@ impl Hasher for PoseidonHasher<Fr> {
     type Domain = PoseidonDomain<Fr>;
     type Function = PoseidonFunction<Fr>;
 
+    // The hasher name should be the same for all fields. The hasher name is used to name the SDR
+    // parent-cache; graph parent generation is not affected by a hasher's field, thus the field
+    // name should not be included in the hasher name.
     fn name() -> String {
         "poseidon_hasher".into()
     }
@@ -619,14 +622,14 @@ impl Hasher for PoseidonHasher<Fp> {
     type Function = PoseidonFunction<Fp>;
 
     fn name() -> String {
-        "poseidon_hasher_pallas".into()
+        "poseidon_hasher".into()
     }
 }
 impl Hasher for PoseidonHasher<Fq> {
     type Domain = PoseidonDomain<Fq>;
     type Function = PoseidonFunction<Fq>;
 
     fn name() -> String {
-        "poseidon_hasher_vesta".into()
+        "poseidon_hasher".into()
     }
 }
diff --git a/filecoin-hashers/src/sha256.rs b/filecoin-hashers/src/sha256.rs
@@ -526,6 +526,9 @@ impl Hasher for Sha256Hasher<Fr> {
     type Domain = Sha256Domain<Fr>;
     type Function = Sha256Function<Fr>;
 
+    // The hasher name should be the same for all fields. The hasher name is used to name the SDR
+    // parent-cache; graph parent generation is not affected by a hasher's field, thus the field
+    // name should not be included in the hasher name.
     fn name() -> String {
         "sha256_hasher".into()
     }
@@ -535,14 +538,14 @@ impl Hasher for Sha256Hasher<Fp> {
     type Function = Sha256Function<Fp>;
 
     fn name() -> String {
-        "sha256_hasher_pallas".into()
+        "sha256_hasher".into()
     }
 }
 impl Hasher for Sha256Hasher<Fq> {
     type Domain = Sha256Domain<Fq>;
     type Function = Sha256Function<Fq>;
 
     fn name() -> String {
-        "sha256_hasher_vesta".into()
+        "sha256_hasher".into()
     }
 }