Commit 470148e7 authored by mdj33's avatar mdj33 Committed by 33cn

fix ut

parent 334d1b01
......@@ -291,19 +291,19 @@ func TestParseEmptyBlockInterval(t *testing.T) {
ret, err := parseEmptyBlockInterval(cfg)
assert.Nil(t, err)
assert.Equal(t, int64(0), ret[0].startHeight)
assert.Equal(t, int64(defaultEmptyBlockInterval), ret[0].interval)
assert.Equal(t, defaultEmptyBlockInterval, ret[0].interval)
cfg = []string{"0:50"}
ret, err = parseEmptyBlockInterval(cfg)
assert.Nil(t, err)
assert.Equal(t, int64(0), ret[0].startHeight)
assert.Equal(t, int64(defaultEmptyBlockInterval), ret[0].interval)
assert.Equal(t, defaultEmptyBlockInterval, ret[0].interval)
cfg = []string{"0:50", "100:20"}
ret, err = parseEmptyBlockInterval(cfg)
assert.Nil(t, err)
assert.Equal(t, int64(0), ret[0].startHeight)
assert.Equal(t, int64(defaultEmptyBlockInterval), ret[0].interval)
assert.Equal(t, defaultEmptyBlockInterval, ret[0].interval)
assert.Equal(t, int64(100), ret[1].startHeight)
assert.Equal(t, int64(20), ret[1].interval)
......@@ -311,7 +311,7 @@ func TestParseEmptyBlockInterval(t *testing.T) {
ret, err = parseEmptyBlockInterval(cfg)
assert.Nil(t, err)
assert.Equal(t, int64(10), ret[0].startHeight)
assert.Equal(t, int64(defaultEmptyBlockInterval), ret[0].interval)
assert.Equal(t, defaultEmptyBlockInterval, ret[0].interval)
cfg = []string{"10:50", "20-30"}
ret, err = parseEmptyBlockInterval(cfg)
......@@ -330,7 +330,7 @@ func TestParseEmptyBlockInterval(t *testing.T) {
ret, err = parseEmptyBlockInterval(cfg)
assert.Nil(t, err)
assert.Equal(t, int64(0), ret[0].startHeight)
assert.Equal(t, int64(defaultEmptyBlockInterval), ret[0].interval)
assert.Equal(t, defaultEmptyBlockInterval, ret[0].interval)
assert.Equal(t, int64(30), ret[1].startHeight)
assert.Equal(t, int64(20), ret[1].interval)
assert.Equal(t, int64(100), ret[2].startHeight)
......
......@@ -923,7 +923,7 @@ func divideStr2Int64s(s, sep string) ([]int64, error) {
var r []int64
a := strings.Split(s, sep)
if len(a) != 2 {
plog.Error("error format for config to seperate", "s", s)
plog.Error("error format for config to separate", "s", s)
return nil, types.ErrInvalidParam
}
......
......@@ -386,7 +386,7 @@ func (client *client) processHashNotMatchError(currSeq int64, lastSeqMainHash []
}
func (client *client) getEmptyInterval(lastBlock *pt.ParaLocalDbBlock) int64 {
for i := len(client.subCfg.EmptyBlockInterval) - 1; i >= 0; i-- {
for i := len(client.dldCfg.emptyInterval) - 1; i >= 0; i-- {
if lastBlock.Height >= client.dldCfg.emptyInterval[i].startHeight {
return client.dldCfg.emptyInterval[i].interval
}
......
......@@ -103,9 +103,8 @@ waitBlocks4CommitMsg=2
genesisAmount=100000000
selfConsensEnablePreContract=["0-1000"]
#主链每隔几个没有相关交易的区块,平行链上打包空区块
[[consensus.sub.para.emptyBlockInterval]]
blockHeight=0
interval=4
emptyBlockInterval=["0:4"]
[store]
......
......@@ -118,9 +118,7 @@ mainBlockHashForkHeight=1
mainForkParacrossCommitTx=1
mainLoopCheckCommitTxDoneForkHeight=11
selfConsensEnablePreContract=["0-1000"]
[[consensus.sub.para.emptyBlockInterval]]
blockHeight=0
interval=2
emptyBlockInterval=["0:2"]
[store]
......
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