update p2p config

plugin/consensus/dpos/chain33.test.toml

@@ -35,21 +35,14 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13802"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=199
-verMix=199
-verMax=199
+
 
 
 [rpc]

plugin/consensus/dpos/dpos_test.go

@@ -393,7 +393,7 @@ func initEnvDpos() (queue.Queue, *blockchain.BlockChain, queue.Module, queue.Mod
 
 	mem := mempool.New(chain33Cfg)
 	mem.SetQueueClient(q.Client())
-	network := p2p.New(chain33Cfg)
+	network := p2p.NewP2PMgr(chain33Cfg)
 
 	network.SetQueueClient(q.Client())
 

plugin/consensus/dpos/node_test.go

@@ -76,21 +76,13 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13802"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
-dbPath="datadir1/addrbook"
+dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=199
-verMix=199
-verMax=199
 
 
 [rpc]
@@ -227,21 +219,14 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13803"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir2/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=199
-verMix=199
-verMax=199
+
 
 
 [rpc]
@@ -585,7 +570,7 @@ func initEnvDpos1(configName string) (queue.Queue, *blockchain.BlockChain, queue
 
 	mem := mempool.New(chain33Cfg)
 	mem.SetQueueClient(q.Client())
-	network := p2p.New(chain33Cfg)
+	network := p2p.NewP2PMgr(chain33Cfg)
 
 	network.SetQueueClient(q.Client())
 

plugin/consensus/pbft/chain33.test.toml

@@ -34,21 +34,19 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13802"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=118
-verMix=118
-verMax=119
+
+[p2p.sub.gossip]
+seeds=["127.0.0.1:13802"]
+isSeed=true
+serverStart=true
+innerBounds=300
 
 [mempool]
 name="timeline"

plugin/consensus/pbft/pbft_test.go

@@ -62,7 +62,7 @@ func TestPbft(t *testing.T) {
 	clearTestData()
 }
 
-func initEnvPbft() (queue.Queue, *blockchain.BlockChain, *p2p.P2p, queue.Module, queue.Module, *executor.Executor, queue.Module, queue.Module) {
+func initEnvPbft() (queue.Queue, *blockchain.BlockChain, *p2p.Manager, queue.Module, queue.Module, *executor.Executor, queue.Module, queue.Module) {
 	flag.Parse()
 	chain33Cfg := types.NewChain33Config(types.ReadFile("chain33.test.toml"))
 	var q = queue.New("channel")
@@ -81,7 +81,7 @@ func initEnvPbft() (queue.Queue, *blockchain.BlockChain, *p2p.P2p, queue.Module,
 	s.SetQueueClient(q.Client())
 	cs := NewPbft(cfg.Consensus, sub.Consensus["pbft"])
 	cs.SetQueueClient(q.Client())
-	p2pnet := p2p.New(chain33Cfg)
+	p2pnet := p2p.NewP2PMgr(chain33Cfg)
 	p2pnet.SetQueueClient(q.Client())
 	walletm := wallet.New(chain33Cfg)
 	walletm.SetQueueClient(q.Client())

plugin/consensus/raft/chain33.test.toml

@@ -35,21 +35,13 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13802"]
+types=[]
 enable=false
-isSeed=false
-serverStart=false
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=15
-verMix=15
-verMax=16
 
 [rpc]
 jrpcBindAddr="localhost:8801"

plugin/consensus/tendermint/chain33.test.toml

@@ -35,21 +35,13 @@ batchsync=false
 enableTxQuickIndex=true
 
 [p2p]
-seeds=["127.0.0.1:13802"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=199
-verMix=199
-verMax=199
 
 
 [rpc]

plugin/consensus/ticket/testdata/chain33.cfg.toml

@@ -40,13 +40,8 @@ isParaChain=false
 enableTxQuickIndex=false
 
 [p2p]
-seeds=[]
-enable=false
-isSeed=false
-serverStart=true
-innerSeedEnable=true
-useGithub=true
-innerBounds=300
+types=["dht"]
+enable=true
 msgCacheSize=10240
 driver="memdb"
 dbPath="datadir/addrbook"

plugin/dapp/cert/authority/test/chain33.auth.test.toml

@@ -35,18 +35,14 @@ batchsync=false
 isRecordBlockSequence=true
 
 [p2p]
-seeds=["47.104.125.151:13802","47.104.125.97:13802","47.104.125.177:13802"]
+types=["dht"]
 enable=true
-isSeed=true
-serverStart=true
 msgCacheSize=10240
 driver="memdb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=216
-verMix=216
-verMax=217
+
 
 [rpc]
 jrpcBindAddr="localhost:8801"

plugin/dapp/dposvote/commands/vote_test.go

@@ -88,22 +88,14 @@ singleMode=true
 batchsync=false
 enableTxQuickIndex=true
 
+
 [p2p]
-seeds=["127.0.0.1:13802"]
-enable=true
-isSeed=true
-serverStart=true
-innerSeedEnable=false
-useGithub=false
-innerBounds=300
+types=["dht"]
 msgCacheSize=10240
 driver="leveldb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=199
-verMix=199
-verMax=199
 
 
 [rpc]
@@ -283,7 +275,7 @@ func initEnvDpos() (queue.Queue, *blockchain.BlockChain, queue.Module, queue.Mod
 
 	mem := mempool.New(chain33Cfg)
 	mem.SetQueueClient(q.Client())
-	network := p2p.New(chain33Cfg)
+	network := p2p.NewP2PMgr(chain33Cfg)
 
 	network.SetQueueClient(q.Client())
 

plugin/dapp/exchange/test/chain33.toml

@@ -45,35 +45,15 @@ isRecordBlockSequence=true
 isParaChain=false
 # 是否开启交易快速查询索引
 enableTxQuickIndex=false
+
 [p2p]
-# P2P服务监听端口号
-port=13802
-# 种子节点，格式为ip:port，多个节点以逗号分隔，如seeds=["10.0.0.1:13802","10.0.0.2:13802","10.0.0.3:13802"]
-seeds=[]
-# 是否启动P2P服务
-enable=true
-# 是否为种子节点
-isSeed=false
-# 是否作为服务端，对外提供服务
-serverStart=true
-# 是否使用内置的种子节点
-innerSeedEnable=false
-# 是否使用Github获取种子节点
-useGithub=false
-# 最多的接入节点个数
-innerBounds=300
-# 使用的数据库类型
+types=["dht"]
+msgCacheSize=10240
 driver="leveldb"
-# 数据库文件目录
 dbPath="datadir/addrbook"
-# 数据库缓存大小
 dbCache=4
-# GRPC请求日志文件
 grpcLogFile="grpc33.log"
-# p2p版本号，不同的测试网络选用不同的version
-version=200
-verMix=200
-verMax=200
+
 [rpc]
 # jrpc绑定地址
 jrpcBindAddr="localhost:8801"
@@ -247,8 +227,8 @@ genesis="1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs"
 [exec.sub.manage]
 #manage执行器超级管理员地址
 superManager=[
-    "1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs", 
-    "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
+    "1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs",
+    "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
 

plugin/dapp/guess/commands/game_test.go

@@ -91,35 +91,16 @@ isRecordBlockSequence=true
 isParaChain=false
 # 是否开启交易快速查询索引
 enableTxQuickIndex=false
+
 [p2p]
-# P2P服务监听端口号
-port=13802
-# 种子节点，格式为ip:port，多个节点以逗号分隔，如seeds=["10.0.0.1:13802","10.0.0.2:13802","10.0.0.3:13802"]
-seeds=[]
-# 是否启动P2P服务
-enable=true
-# 是否为种子节点
-isSeed=false
-# 是否作为服务端，对外提供服务
-serverStart=true
-# 是否使用内置的种子节点
-innerSeedEnable=false
-# 是否使用Github获取种子节点
-useGithub=false
-# 最多的接入节点个数
-innerBounds=300
-# 使用的数据库类型
+types=["dht"]
+msgCacheSize=10240
 driver="leveldb"
-# 数据库文件目录
 dbPath="datadir/addrbook"
-# 数据库缓存大小
 dbCache=4
-# GRPC请求日志文件
 grpcLogFile="grpc33.log"
-# p2p版本号，不同的测试网络选用不同的version
-version=200
-verMix=200
-verMax=200
+
+
 [rpc]
 # jrpc绑定地址
 jrpcBindAddr="localhost:8803"
@@ -462,7 +443,7 @@ func initEnvGuess() (queue.Queue, *blockchain.BlockChain, queue.Module, queue.Mo
 
 	mem := mempool.New(chain33Cfg)
 	mem.SetQueueClient(q.Client())
-	network := p2p.New(chain33Cfg)
+	network := p2p.NewP2PMgr(chain33Cfg)
 
 	network.SetQueueClient(q.Client())
 

plugin/dapp/paracross/testnode/cfg.go

@@ -44,13 +44,7 @@ isParaChain = true
 enableTxQuickIndex=false
 
 [p2p]
-seeds=[]
 enable=false
-isSeed=false
-serverStart=true
-innerSeedEnable=true
-useGithub=true
-innerBounds=300
 msgCacheSize=10240
 driver="leveldb"
 dbPath="paradatadir/addrbook"

plugin/dapp/ticket/executor/testdata/chain33.cfg.toml

@@ -39,19 +39,14 @@ isParaChain=false
 enableTxQuickIndex=false
 
 [p2p]
-seeds=[]
-enable=false
-isSeed=false
-serverStart=true
-innerSeedEnable=true
-useGithub=true
-innerBounds=300
+types=["dht"]
 msgCacheSize=10240
 driver="memdb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
 
+
 [rpc]
 jrpcBindAddr="localhost:0"
 grpcBindAddr="localhost:0"

plugin/mempool/price/chain33.test.toml

@@ -39,19 +39,12 @@ enableTxQuickIndex=false
 
 
 [p2p]
-port=13802
-seeds=["47.104.125.151:13802","47.104.125.97:13802","47.104.125.177:13802"]
-enable=false
-isSeed=true
-serverStart=true
+types=["dht"]
 msgCacheSize=10240
 driver="memdb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=216
-verMix=216
-verMax=217
 
 [rpc]
 jrpcBindAddr="localhost:8801"

plugin/mempool/score/chain33.test.toml

@@ -39,19 +39,13 @@ enableTxQuickIndex=false
 
 
 [p2p]
-port=13802
-seeds=["47.104.125.151:13802","47.104.125.97:13802","47.104.125.177:13802"]
-enable=false
-isSeed=true
-serverStart=true
+types=["dht"]
 msgCacheSize=10240
 driver="memdb"
 dbPath="datadir/addrbook"
 dbCache=4
 grpcLogFile="grpc33.log"
-version=216
-verMix=216
-verMax=217
+
 
 [rpc]
 jrpcBindAddr="localhost:8801"