From bf5181d9cad4687c35ddc1c5cdf89d88c4140a18 Mon Sep 17 00:00:00 2001
From: zramsay <zach@monax.io>
Date: Tue, 30 May 2017 11:00:40 -0400
Subject: [PATCH] address PR comments

---
 p2p/upnp/probe.go  | 10 ++++++----
 state/execution.go | 12 ++++++++++++
 types/block.go     |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/p2p/upnp/probe.go b/p2p/upnp/probe.go
index 0c263ee1c..74d4d4c51 100644
--- a/p2p/upnp/probe.go
+++ b/p2p/upnp/probe.go
@@ -5,6 +5,8 @@ import (
 	"net"
 	"time"
 
+	"github.com/pkg/errors"
+
 	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
 )
@@ -17,26 +19,26 @@ type UPNPCapabilities struct {
 func makeUPNPListener(intPort int, extPort int, logger log.Logger) (NAT, net.Listener, net.IP, error) {
 	nat, err := Discover()
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("NAT upnp could not be discovered: %v", err)
+		return nil, nil, nil, errors.Errorf("NAT upnp could not be discovered: %v", err)
 	}
 	logger.Info(cmn.Fmt("ourIP: %v", nat.(*upnpNAT).ourIP))
 
 	ext, err := nat.GetExternalAddress()
 	if err != nil {
-		return nat, nil, nil, fmt.Errorf("External address error: %v", err)
+		return nat, nil, nil, errors.Errorf("External address error: %v", err)
 	}
 	logger.Info(cmn.Fmt("External address: %v", ext))
 
 	port, err := nat.AddPortMapping("tcp", extPort, intPort, "Tendermint UPnP Probe", 0)
 	if err != nil {
-		return nat, nil, ext, fmt.Errorf("Port mapping error: %v", err)
+		return nat, nil, ext, errors.Errorf("Port mapping error: %v", err)
 	}
 	logger.Info(cmn.Fmt("Port mapping mapped: %v", port))
 
 	// also run the listener, open for all remote addresses.
 	listener, err := net.Listen("tcp", fmt.Sprintf(":%v", intPort))
 	if err != nil {
-		return nat, nil, ext, fmt.Errorf("Error establishing listener: %v", err)
+		return nat, nil, ext, errors.Errorf("Error establishing listener: %v", err)
 	}
 	return nat, listener, ext, nil
 }
diff --git a/state/execution.go b/state/execution.go
index 547fd3675..2a64f1885 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -155,6 +155,18 @@ func updateValidators(validators *types.ValidatorSet, changedValidators []*abci.
 	return nil
 }
 
+// return a bit array of validators that signed the last commit
+// NOTE: assumes commits have already been authenticated
+/*func commitBitArrayFromBlock(block *types.Block) *cmn.BitArray {
+	signed := cmn.NewBitArray(len(block.LastCommit.Precommits))
+	for i, precommit := range block.LastCommit.Precommits {
+		if precommit != nil {
+			signed.SetIndex(i, true) // val_.LastCommitHeight = block.Height - 1
+		}
+	}
+	return signed
+}*/
+
 //-----------------------------------------------------
 // Validate block
 
diff --git a/types/block.go b/types/block.go
index 26fc152ce..6592ad5dd 100644
--- a/types/block.go
+++ b/types/block.go
@@ -282,7 +282,7 @@ func (commit *Commit) GetByIndex(index int) *Vote {
 }
 
 func (commit *Commit) IsCommit() bool {
-	return len(commit.Precommits) == 0
+	return len(commit.Precommits) != 0
 }
 
 func (commit *Commit) ValidateBasic() error {