use golinter

2 files changed, 53 insertions, 19 deletions

diff --git a/go/bls/bls.go b/go/bls/bls.go
index 4dcd662..ec3fa1d 100644
--- a/go/bls/bls.go
+++ b/go/bls/bls.go
@@ -125,6 +125,7 @@ func (sec *SecretKey) SetData(buf []byte) error {
 func (sec *SecretKey) GetData() []byte {
 	fpSize := GetOpUnitSize() * 8
 	buf := make([]byte, fpSize)
+	// #nosec
 	n := C.blsSecretKeyGetData(sec.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
 	if n != C.size_t(fpSize) {
 		panic("implementation err. size of buf is small")
@@ -133,8 +134,8 @@ func (sec *SecretKey) GetData() []byte {
 }
 
 // IsSame --
-func (lhs *SecretKey) IsSame(rhs *SecretKey) bool {
-	return C.blsSecretKeyIsSame(lhs.getPointer(), rhs.getPointer()) == 1
+func (sec *SecretKey) IsSame(rhs *SecretKey) bool {
+	return C.blsSecretKeyIsSame(sec.getPointer(), rhs.getPointer()) == 1
 }
 
 // SetArray --
@@ -228,9 +229,9 @@ func (pub *PublicKey) SetStr(s string) error {
 }
 
 // SetData --
-func (sec *PublicKey) SetData(buf []byte) error {
+func (pub *PublicKey) SetData(buf []byte) error {
 	// #nosec
-	err := C.blsPublicKeySetData(sec.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
+	err := C.blsPublicKeySetData(pub.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
 	if err > 0 {
 		return fmt.Errorf("bad buf:%s", buf)
 	}
@@ -238,10 +239,11 @@ func (sec *PublicKey) SetData(buf []byte) error {
 }
 
 // GetData --
-func (sec *PublicKey) GetData() []byte {
+func (pub *PublicKey) GetData() []byte {
 	fpSize := GetOpUnitSize() * 8
 	buf := make([]byte, fpSize*2)
-	n := C.blsPublicKeyGetData(sec.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
+	// #nosec
+	n := C.blsPublicKeyGetData(pub.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
 	if n != C.size_t(fpSize*2) {
 		panic("implementation err. size of buf is small")
 	}
@@ -249,8 +251,8 @@ func (sec *PublicKey) GetData() []byte {
 }
 
 // IsSame --
-func (lhs *PublicKey) IsSame(rhs *PublicKey) bool {
-	return C.blsPublicKeyIsSame(lhs.getPointer(), rhs.getPointer()) == 1
+func (pub *PublicKey) IsSame(rhs *PublicKey) bool {
+	return C.blsPublicKeyIsSame(pub.getPointer(), rhs.getPointer()) == 1
 }
 
 // Add --
@@ -302,9 +304,9 @@ func (sign *Sign) SetStr(s string) error {
 }
 
 // SetData --
-func (sec *Sign) SetData(buf []byte) error {
+func (sign *Sign) SetData(buf []byte) error {
 	// #nosec
-	err := C.blsSignSetData(sec.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
+	err := C.blsSignSetData(sign.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
 	if err > 0 {
 		return fmt.Errorf("bad buf:%s", buf)
 	}
@@ -312,10 +314,11 @@ func (sec *Sign) SetData(buf []byte) error {
 }
 
 // GetData --
-func (sec *Sign) GetData() []byte {
+func (sign *Sign) GetData() []byte {
 	fpSize := GetOpUnitSize() * 8
 	buf := make([]byte, fpSize)
-	n := C.blsSignGetData(sec.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
+	// #nosec
+	n := C.blsSignGetData(sign.getPointer(), (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(len(buf)))
 	if n != C.size_t(fpSize) {
 		panic("implementation err. size of buf is small")
 	}
@@ -323,8 +326,8 @@ func (sec *Sign) GetData() []byte {
 }
 
 // IsSame --
-func (lhs *Sign) IsSame(rhs *Sign) bool {
-	return C.blsSignIsSame(lhs.getPointer(), rhs.getPointer()) == 1
+func (sign *Sign) IsSame(rhs *Sign) bool {
+	return C.blsSignIsSame(sign.getPointer(), rhs.getPointer()) == 1
 }
 
 // GetPublicKey --
diff --git a/go/bls/bls_test.go b/go/bls/bls_test.go
index cf03c53..b36376d 100644
--- a/go/bls/bls_test.go
+++ b/go/bls/bls_test.go
@@ -10,14 +10,13 @@ var unitN = 0
 
 func testPre(t *testing.T) {
 	t.Log("init")
-	var err error
 	{
 		var id ID
 		id.Set([]uint64{6, 5, 4, 3, 2, 1}[0:unitN])
 
 		t.Log("id :", id)
 		var id2 ID
-		err = id2.SetStr(id.String())
+		err := id2.SetStr(id.String())
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -53,6 +52,28 @@ func testPre(t *testing.T) {
 	}
 }
 
+func testStringConversion(t *testing.T) {
+	t.Log("testRecoverSecretKey")
+	var sec SecretKey
+	var s string
+	if unitN == 6 {
+		s = "16798108731015832284940804142231733909759579603404752749028378864165570215949"
+	} else {
+		s = "40804142231733909759579603404752749028378864165570215949"
+	}
+	err := sec.SetStr(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("String: ", s, sec.String())
+	s = "401035055535747319451436327113007154621327258807739504261475863403006987855"
+	err = sec.SetStr(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("String: ", s, sec.String())
+}
+
 func testRecoverSecretKey(t *testing.T) {
 	t.Log("testRecoverSecretKey")
 	k := 3000
@@ -178,14 +199,20 @@ func testData(t *testing.T) {
 	var sec1, sec2 SecretKey
 	sec1.Init()
 	s := sec1.GetData()
-	sec2.SetData(s)
+	err := sec2.SetData(s)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if !sec1.IsSame(&sec2) {
 		t.Error("SecretKey not same")
 	}
 	pub1 := sec1.GetPublicKey()
 	s = pub1.GetData()
 	var pub2 PublicKey
-	pub2.SetData(s)
+	err = pub2.SetData(s)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if !pub1.IsSame(&pub2) {
 		t.Error("PublicKey not same")
 	}
@@ -193,7 +220,10 @@ func testData(t *testing.T) {
 	sign1 := sec1.Sign(m)
 	s = sign1.GetData()
 	var sign2 Sign
-	sign2.SetData(s)
+	err = sign2.SetData(s)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if !sign1.IsSame(&sign2) {
 		t.Error("Sign not same")
 	}
@@ -329,6 +359,7 @@ func test(t *testing.T, c int) {
 	testSign(t)
 	testPop(t)
 	testData(t)
+	testStringConversion(t)
 }
 
 func TestMain(t *testing.T) {