Change ProofLength() to const ProofSize

crypto/vrf/README.md

@@ -12,7 +12,6 @@ VRF implementation is set by `func init()` with `build` option
 type vrfEd25519 interface {
 	Prove(privateKey []byte, message []byte) (Proof, error)
 	Verify(publicKey []byte, proof Proof, message []byte) (bool, error)
-	ProofLength() int
 	ProofToHash(proof Proof) (Output, error)
 ```
 
@@ -26,17 +25,20 @@ Use `func init()` with `build` option
       * `//go:build libsodium`
       * `// +build !libsodium,!coniks`
       * `func init() { defaultVrf = newVrfEd25519r2ishiguro() }`
+      * `const ProofSize = 81`
       * vrf_r2ishiguro.go
     * (coniks)
       * `//go:build coniks`
       * `// +build coniks`
       * `func init() { defaultVrf = newVrfEd25519coniks() }`
+      * `const ProofSize = 96`
       * vrf_coniks.go
       * vrf_coniks_test.go
     * (libsodium)
       * `//go:build libsodium`
       * `// +build libsodium`
       * `func init() { defaultVrf = newVrfEd25519libsodium() }`
+      * `const ProofSize = int(libsodium.PROOFBYTES)`
       * vrf_libsodium.go
       * vrf_libsodium_test.go
 

crypto/vrf/vrf.go

@@ -16,7 +16,6 @@ type Output []byte
 type vrfEd25519 interface {
 	Prove(privateKey []byte, message []byte) (Proof, error)
 	Verify(publicKey []byte, proof Proof, message []byte) (bool, error)
-	ProofLength() int
 	ProofToHash(proof Proof) (Output, error)
 }
 
@@ -34,10 +33,6 @@ func Verify(publicKey []byte, proof Proof, message []byte) (bool, error) {
 	return defaultVrf.Verify(publicKey, proof, message)
 }
 
-func ProofLength() int {
-	return defaultVrf.ProofLength()
-}
-
 func ProofToHash(proof Proof) (Output, error) {
 	return defaultVrf.ProofToHash(proof)
 }

crypto/vrf/vrf_coniks.go

@@ -19,7 +19,7 @@ func init() {
 	defaultVrf = newVrfEd25519coniks()
 }
 
-const ConiksProofLength = 96
+const ProofSize = 96
 
 func newVrfEd25519coniks() *vrfEd25519coniks {
 	return &vrfEd25519coniks{nil, nil}
@@ -56,10 +56,6 @@ func (base *vrfEd25519coniks) Verify(publicKey []byte, proof Proof, message []by
 	return coniksPubKey.Verify(message, base.generatedHash, proof), nil
 }
 
-func (base *vrfEd25519coniks) ProofLength() int {
-	return ConiksProofLength
-}
-
 func (base *vrfEd25519coniks) ProofToHash(proof Proof) (Output, error) {
 	if base.generatedHash == nil {
 		return nil, errors.New("vrf hash was not given")

crypto/vrf/vrf_libsodium.go

@@ -18,7 +18,7 @@ func init() {
 	defaultVrf = newVrfEd25519libsodium()
 }
 
-const LibsodiumProofLength = 80
+const ProofSize = int(libsodium.PROOFBYTES)
 
 func newVrfEd25519libsodium() vrfEd25519libsodium {
 	return vrfEd25519libsodium{}
@@ -48,10 +48,6 @@ func (base vrfEd25519libsodium) Verify(publicKey []byte, proof Proof, message []
 	return bytes.Compare(op[:], hash) == 0, nil
 }
 
-func (base vrfEd25519libsodium) ProofLength() int {
-	return LibsodiumProofLength
-}
-
 func (base vrfEd25519libsodium) ProofToHash(proof Proof) (Output, error) {
 	op, err := libsodium.ProofToHash(toArray(proof))
 	if err != nil {

crypto/vrf/vrf_r2ishiguro.go

@@ -19,7 +19,7 @@ func init() {
 	}
 }
 
-const R2ishiguroProofLength = 81
+const ProofSize = 81
 
 func newVrfEd25519r2ishiguro() vrfEd25519r2ishiguro {
 	return vrfEd25519r2ishiguro{}
@@ -34,10 +34,6 @@ func (base vrfEd25519r2ishiguro) Verify(publicKey []byte, proof Proof, message [
 	return r2ishiguro.ECVRF_verify(publicKey, proof, message)
 }
 
-func (base vrfEd25519r2ishiguro) ProofLength() int {
-	return R2ishiguroProofLength
-}
-
 func (base vrfEd25519r2ishiguro) ProofToHash(proof Proof) (Output, error) {
 	// validate proof with ECVRF_decode_proof
 	_, _, _, err := r2ishiguro.ECVRF_decode_proof(proof)

evidence/verify_test.go

@@ -734,7 +734,7 @@ func makeHeaderRandom(height int64) *types.Header {
 		LastResultsHash:    crypto.CRandBytes(tmhash.Size),
 		EvidenceHash:       crypto.CRandBytes(tmhash.Size),
 		ProposerAddress:    crypto.CRandBytes(crypto.AddressSize),
-		Proof:              crypto.CRandBytes(vrf.ProofLength()),
+		Proof:              crypto.CRandBytes(vrf.ProofSize),
 	}
 }
 

types/block_test.go

@@ -644,7 +644,7 @@ func TestHeaderValidateBasic(t *testing.T) {
 			header.Round = -1
 		}, true},
 		{"Invalid Proof", func(header *Header) {
-			header.Proof = make([]byte, vrf.ProofLength()-1)
+			header.Proof = make([]byte, vrf.ProofSize-1)
 		}, true},
 		{"Invalid Validators Hash", func(header *Header) {
 			header.ValidatorsHash = []byte(strings.Repeat("h", invalidHashLength))
@@ -671,7 +671,7 @@ func TestHeaderValidateBasic(t *testing.T) {
 				EvidenceHash:       tmhash.Sum([]byte("evidence_hash")),
 				ProposerAddress:    crypto.AddressHash([]byte("proposer_address")),
 				Round:              1,
-				Proof:              make([]byte, vrf.ProofLength()),
+				Proof:              make([]byte, vrf.ProofSize),
 			}
 			tc.malleateHeader(header)
 			err := header.ValidateBasic()
@@ -1279,7 +1279,7 @@ func makeRandHeader() Header {
 	height := tmrand.Int63()
 	randBytes := tmrand.Bytes(tmhash.Size)
 	randAddress := tmrand.Bytes(crypto.AddressSize)
-	randProof := tmrand.Bytes(vrf.ProofLength())
+	randProof := tmrand.Bytes(vrf.ProofSize)
 	h := Header{
 		Version:            tmversion.Consensus{Block: version.BlockProtocol, App: 1},
 		ChainID:            chainID,

types/validation.go

@@ -41,11 +41,11 @@ func ValidateHash(h []byte) error {
 }
 
 // ValidateProof returns an error if the proof is not empty, but its
-// size != vrf.ProofLength().
+// size != vrf.ProofSize.
 func ValidateProof(h []byte) error {
-	if len(h) > 0 && len(h) != vrf.ProofLength() {
+	if len(h) > 0 && len(h) != vrf.ProofSize {
 		return fmt.Errorf("expected size to be %d bytes, got %d bytes",
-			vrf.ProofLength(),
+			vrf.ProofSize,
 			len(h),
 		)
 	}