mirror of
https://github.com/arnaucube/go-iden3-crypto.git
synced 2026-02-07 03:26:39 +01:00
Merge pull request #24 from iden3/fix/hashbytes-err
Poseidon & MiMC7 HashBytes remove return of err
This commit is contained in:
15
.travis.yml
15
.travis.yml
@@ -1,15 +0,0 @@
|
|||||||
dist: xenial
|
|
||||||
language: go
|
|
||||||
|
|
||||||
go:
|
|
||||||
- "1.12"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
- name: "Unit Tests 64 bit arch"
|
|
||||||
env: GOARCH="amd64"
|
|
||||||
- name: "Unit Test 32 bit arch"
|
|
||||||
env: GOARCH="386"
|
|
||||||
|
|
||||||
env:
|
|
||||||
- GO111MODULE=on
|
|
||||||
@@ -137,7 +137,7 @@ func Hash(arr []*big.Int, key *big.Int) (*big.Int, error) {
|
|||||||
|
|
||||||
// HashBytes hashes a msg byte slice by blocks of 31 bytes encoded as
|
// HashBytes hashes a msg byte slice by blocks of 31 bytes encoded as
|
||||||
// little-endian
|
// little-endian
|
||||||
func HashBytes(b []byte) (*big.Int, error) {
|
func HashBytes(b []byte) *big.Int {
|
||||||
n := 31
|
n := 31
|
||||||
bElems := make([]*big.Int, 0, len(b)/n+1)
|
bElems := make([]*big.Int, 0, len(b)/n+1)
|
||||||
for i := 0; i < len(b)/n; i++ {
|
for i := 0; i < len(b)/n; i++ {
|
||||||
@@ -150,5 +150,9 @@ func HashBytes(b []byte) (*big.Int, error) {
|
|||||||
utils.SetBigIntFromLEBytes(v, b[(len(b)/n)*n:])
|
utils.SetBigIntFromLEBytes(v, b[(len(b)/n)*n:])
|
||||||
bElems = append(bElems, v)
|
bElems = append(bElems, v)
|
||||||
}
|
}
|
||||||
return Hash(bElems, nil)
|
h, err := Hash(bElems, nil)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
return h
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,8 +74,7 @@ func TestMIMC7(t *testing.T) {
|
|||||||
assert.Equal(t, "0x"+hex.EncodeToString((*big.Int)(h4).Bytes()), "0x284bc1f34f335933a23a433b6ff3ee179d682cd5e5e2fcdd2d964afa85104beb")
|
assert.Equal(t, "0x"+hex.EncodeToString((*big.Int)(h4).Bytes()), "0x284bc1f34f335933a23a433b6ff3ee179d682cd5e5e2fcdd2d964afa85104beb")
|
||||||
|
|
||||||
msg := []byte("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
|
msg := []byte("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
|
||||||
hmsg, err := HashBytes(msg)
|
hmsg := HashBytes(msg)
|
||||||
assert.Nil(t, err)
|
|
||||||
assert.Equal(t, "16855787120419064316734350414336285711017110414939748784029922801367685456065", hmsg.String())
|
assert.Equal(t, "16855787120419064316734350414336285711017110414939748784029922801367685456065", hmsg.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ func Hash(arr []*big.Int) (*big.Int, error) {
|
|||||||
|
|
||||||
// HashBytes hashes a msg byte slice by blocks of 31 bytes encoded as
|
// HashBytes hashes a msg byte slice by blocks of 31 bytes encoded as
|
||||||
// little-endian
|
// little-endian
|
||||||
func HashBytes(b []byte) (*big.Int, error) {
|
func HashBytes(b []byte) *big.Int {
|
||||||
n := 31
|
n := 31
|
||||||
bElems := make([]*big.Int, 0, len(b)/n+1)
|
bElems := make([]*big.Int, 0, len(b)/n+1)
|
||||||
for i := 0; i < len(b)/n; i++ {
|
for i := 0; i < len(b)/n; i++ {
|
||||||
@@ -193,5 +193,9 @@ func HashBytes(b []byte) (*big.Int, error) {
|
|||||||
utils.SetBigIntFromLEBytes(v, b[(len(b)/n)*n:])
|
utils.SetBigIntFromLEBytes(v, b[(len(b)/n)*n:])
|
||||||
bElems = append(bElems, v)
|
bElems = append(bElems, v)
|
||||||
}
|
}
|
||||||
return Hash(bElems)
|
h, err := Hash(bElems)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
return h
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,8 +73,7 @@ func TestPoseidon(t *testing.T) {
|
|||||||
assert.Nil(t, err)
|
assert.Nil(t, err)
|
||||||
assert.Equal(t, "2978613163687734485261639854325792381691890647104372645321246092227111432722", hmsg2.String())
|
assert.Equal(t, "2978613163687734485261639854325792381691890647104372645321246092227111432722", hmsg2.String())
|
||||||
|
|
||||||
hmsg2, err = HashBytes(msg2)
|
hmsg2 = HashBytes(msg2)
|
||||||
assert.Nil(t, err)
|
|
||||||
assert.Equal(t, "2978613163687734485261639854325792381691890647104372645321246092227111432722", hmsg2.String())
|
assert.Equal(t, "2978613163687734485261639854325792381691890647104372645321246092227111432722", hmsg2.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user