Commit 1bed9acf authored by madengji's avatar madengji Committed by 33cn

fix ut

parent d84308aa
...@@ -48,14 +48,13 @@ enablePushSubscribe=false ...@@ -48,14 +48,13 @@ enablePushSubscribe=false
[p2p] [p2p]
types=["dht"] types=["dht"]
enable=true enable=false
driver="leveldb" driver="leveldb"
dbPath="paradatadir/addrbook" dbPath="paradatadir/addrbook"
dbCache=4 dbCache=4
grpcLogFile="grpc33.log" grpcLogFile="grpc33.log"
[p2p.sub.dht] [p2p.sub.dht]
isSeed=true
DHTDataPath="paradatadir/p2pstore" DHTDataPath="paradatadir/p2pstore"
[rpc] [rpc]
...@@ -112,7 +111,6 @@ mainForkParacrossCommitTx=2270000 ...@@ -112,7 +111,6 @@ mainForkParacrossCommitTx=2270000
mainLoopCheckCommitTxDoneForkHeight=4320000 mainLoopCheckCommitTxDoneForkHeight=4320000
#无平行链交易的主链区块间隔,平行链产生一个空块,从高度0开始,配置[blockHeight:interval],比如["0:50","1000:100"] #无平行链交易的主链区块间隔,平行链产生一个空块,从高度0开始,配置[blockHeight:interval],比如["0:50","1000:100"]
emptyBlockInterval=["0:50"] emptyBlockInterval=["0:50"]
blsSign=true
[store] [store]
......
...@@ -414,7 +414,6 @@ func getValidAddrs(nodes map[string]struct{}, addrs []string) []string { ...@@ -414,7 +414,6 @@ func getValidAddrs(nodes map[string]struct{}, addrs []string) []string {
//bls签名共识交易验证 大约平均耗时30ms (20~40ms) //bls签名共识交易验证 大约平均耗时30ms (20~40ms)
func (a *action) procBlsSign(nodesArry []string, commit *pt.ParacrossCommitAction) ([]string, error) { func (a *action) procBlsSign(nodesArry []string, commit *pt.ParacrossCommitAction) ([]string, error) {
signAddrs := util.GetAddrsByBitMap(nodesArry, commit.Bls.AddrsMap) signAddrs := util.GetAddrsByBitMap(nodesArry, commit.Bls.AddrsMap)
var pubs []string var pubs []string
for _, addr := range signAddrs { for _, addr := range signAddrs {
......
...@@ -21,7 +21,6 @@ var ( ...@@ -21,7 +21,6 @@ var (
clog = log.New("module", "execs.paracross") clog = log.New("module", "execs.paracross")
enableParacrossTransfer = true enableParacrossTransfer = true
driverName = pt.ParaX driverName = pt.ParaX
blsSignName = "bls"
) )
// Paracross exec // Paracross exec
......
...@@ -6,6 +6,7 @@ package paracross ...@@ -6,6 +6,7 @@ package paracross
import ( import (
"github.com/33cn/chain33/pluginmgr" "github.com/33cn/chain33/pluginmgr"
_ "github.com/33cn/plugin/plugin/crypto/bls"
_ "github.com/33cn/plugin/plugin/dapp/paracross/autotest" // register autotest package _ "github.com/33cn/plugin/plugin/dapp/paracross/autotest" // register autotest package
"github.com/33cn/plugin/plugin/dapp/paracross/commands" "github.com/33cn/plugin/plugin/dapp/paracross/commands"
"github.com/33cn/plugin/plugin/dapp/paracross/executor" "github.com/33cn/plugin/plugin/dapp/paracross/executor"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment