ABCI 2.0: ABCI results should be enums

abci/types/types.go

@@ -55,6 +55,11 @@ func (r ResponseVerifyVoteExtension) IsAccepted() bool {
 	return r.Status == ResponseVerifyVoteExtension_ACCEPT
 }
 
+// IsStatusUnknown returns true if Code is Unknown
+func (r ResponseVerifyVoteExtension) IsStatusUnknown() bool {
+	return r.Status == ResponseVerifyVoteExtension_UNKNOWN
+}
+
 //---------------------------------------------------------------------------
 // override JSON marshaling so we emit defaults (ie. disable omitempty)
 

consensus/state.go

@@ -2043,6 +2043,8 @@ func (cs *State) tryAddVote(vote *types.Vote, peerID p2p.ID) (bool, error) {
 			return added, err
 		} else if errors.Is(err, types.ErrVoteNonDeterministicSignature) {
 			cs.Logger.Debug("vote has non-deterministic signature", "err", err)
+		} else if errors.Is(err, types.ErrInvalidVoteExtension) {
+			cs.Logger.Debug("vote has invalid extension")
 		} else {
 			// Either
 			// 1) bad peer OR

state/execution.go

@@ -3,7 +3,6 @@ package state
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -321,8 +320,11 @@ func (blockExec *BlockExecutor) VerifyVoteExtension(ctx context.Context, vote *t
 		panic(fmt.Errorf("VerifyVoteExtension call failed: %w", err))
 	}
 
+	if resp.IsStatusUnknown() {
+		panic(fmt.Sprintf("VerifyVoteExtension responded with status %s", resp.Status.String()))
+	}
 	if !resp.IsAccepted() {
-		return errors.New("invalid vote extension")
+		return types.ErrInvalidVoteExtension
 	}
 
 	return nil

types/vote.go

@@ -28,6 +28,7 @@ var (
 	ErrVoteNonDeterministicSignature = errors.New("non-deterministic signature")
 	ErrVoteNil                       = errors.New("nil vote")
 	ErrVoteExtensionAbsent           = errors.New("vote extension absent")
+	ErrInvalidVoteExtension          = errors.New("invalid vote extension")
 )
 
 type ErrVoteConflictingVotes struct {