mirror of
https://github.com/fluencelabs/tendermint
synced 2025-06-29 20:51:45 +00:00
address PR comments
This commit is contained in:
@ -5,6 +5,8 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
|
||||||
cmn "github.com/tendermint/tmlibs/common"
|
cmn "github.com/tendermint/tmlibs/common"
|
||||||
"github.com/tendermint/tmlibs/log"
|
"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) {
|
func makeUPNPListener(intPort int, extPort int, logger log.Logger) (NAT, net.Listener, net.IP, error) {
|
||||||
nat, err := Discover()
|
nat, err := Discover()
|
||||||
if err != nil {
|
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))
|
logger.Info(cmn.Fmt("ourIP: %v", nat.(*upnpNAT).ourIP))
|
||||||
|
|
||||||
ext, err := nat.GetExternalAddress()
|
ext, err := nat.GetExternalAddress()
|
||||||
if err != nil {
|
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))
|
logger.Info(cmn.Fmt("External address: %v", ext))
|
||||||
|
|
||||||
port, err := nat.AddPortMapping("tcp", extPort, intPort, "Tendermint UPnP Probe", 0)
|
port, err := nat.AddPortMapping("tcp", extPort, intPort, "Tendermint UPnP Probe", 0)
|
||||||
if err != nil {
|
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))
|
logger.Info(cmn.Fmt("Port mapping mapped: %v", port))
|
||||||
|
|
||||||
// also run the listener, open for all remote addresses.
|
// also run the listener, open for all remote addresses.
|
||||||
listener, err := net.Listen("tcp", fmt.Sprintf(":%v", intPort))
|
listener, err := net.Listen("tcp", fmt.Sprintf(":%v", intPort))
|
||||||
if err != nil {
|
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
|
return nat, listener, ext, nil
|
||||||
}
|
}
|
||||||
|
@ -155,6 +155,18 @@ func updateValidators(validators *types.ValidatorSet, changedValidators []*abci.
|
|||||||
return nil
|
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
|
// Validate block
|
||||||
|
|
||||||
|
@ -282,7 +282,7 @@ func (commit *Commit) GetByIndex(index int) *Vote {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (commit *Commit) IsCommit() bool {
|
func (commit *Commit) IsCommit() bool {
|
||||||
return len(commit.Precommits) == 0
|
return len(commit.Precommits) != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (commit *Commit) ValidateBasic() error {
|
func (commit *Commit) ValidateBasic() error {
|
||||||
|
Reference in New Issue
Block a user