fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-29 14:11:21 +00:00
Code Issues Projects Releases Wiki Activity

config: filter_peers defaults to false

Browse Source
This commit is contained in:
Ethan Buchman 2016-09-08 18:56:02 -04:00
parent 943ad0e93f
commit 9bb32f41f1
4 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/tendermint/config.go
View File

@ -70,6 +70,7 @@ func GetConfig(rootDir string) cfg.Config {
mapConfig.SetDefault("revision_file", rootDir+"/revision")
mapConfig.SetDefault("cswal", rootDir+"/data/cswal")
mapConfig.SetDefault("cswal_light", false)
mapConfig.SetDefault("filter_peers", false)
mapConfig.SetDefault("block_size", 10000)
mapConfig.SetDefault("disable_data_hash", false)

1
config/tendermint_test/config.go
View File

@ -83,6 +83,7 @@ func ResetConfig(localPath string) cfg.Config {
mapConfig.SetDefault("revision_file", rootDir+"/revision")
mapConfig.SetDefault("cswal", rootDir+"/data/cswal")
mapConfig.SetDefault("cswal_light", false)
mapConfig.SetDefault("filter_peers", false)
mapConfig.SetDefault("block_size", 10000)
mapConfig.SetDefault("disable_data_hash", false)

11
node/node.go
View File

@ -58,8 +58,8 @@ func NewNode(config cfg.Config, privValidator *types.PrivValidator) *Node {
// Get State
state := getState(config, stateDB)
// Create the proxyApp, which houses two connections,
// one for the consensus and one for the mempool.
// Create the proxyApp, which houses three connections:
// query, consensus, and mempool
proxyApp := proxy.NewAppConns(config, state, blockStore)
// add the chainid and number of validators to the global config
@ -112,8 +112,10 @@ func NewNode(config cfg.Config, privValidator *types.PrivValidator) *Node {
sw.AddReactor("BLOCKCHAIN", bcReactor)
sw.AddReactor("CONSENSUS", consensusReactor)
// filter peers by addr or pubkey
// NOTE: query format subject to change
// filter peers by addr or pubkey with a tmsp query.
// if the query return code is OK, add peer
// XXX: query format subject to change
if config.GetBool("filter_peers") {
sw.SetAddrFilter(func(addr net.Addr) error {
res := proxyApp.Query().QuerySync([]byte(Fmt("p2p/filter/addr/%s", addr.String())))
if res.IsOK() {
@ -128,6 +130,7 @@ func NewNode(config cfg.Config, privValidator *types.PrivValidator) *Node {
}
return res
})
}
// add the event switch to all services
// they should all satisfy events.Eventable

14
proxy/multi_app_conn.go
View File

@ -11,7 +11,7 @@ import (
nilapp "github.com/tendermint/tmsp/example/nil"
)
// Get a connected tmsp client and perform handshake
// Get a connected tmsp client
func NewTMSPClient(addr, transport string) (tmspcli.Client, error) {
var client tmspcli.Client
@ -38,18 +38,6 @@ func NewTMSPClient(addr, transport string) (tmspcli.Client, error) {
return client, nil
}
// TODO
func Handshake(config cfg.Config, state State, blockStore BlockStore) {
// XXX: Handshake
/*res := client.CommitSync()
if res.IsErr() {
PanicCrisis(Fmt("Error in getting multiAppConnConn hash: %v", res))
}
if !bytes.Equal(hash, res.Data) {
log.Warn(Fmt("ProxyApp hash does not match. Expected %X, got %X", hash, res.Data))
}*/
}
//---------
type AppConns interface {