del redundane code

plugin/dapp/autonomy/executor/board.go

@@ -63,50 +63,6 @@ func (a *Autonomy) execAutoDelLocal(tx *types.Transaction, receiptData *types.Re
 	return dbSet, nil
 }
 
-func (a *Autonomy) execDelLocalBoard(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
-	table := NewBoardTable(a.GetLocalDB())
-	for _, log := range receiptData.Logs {
-		switch log.Ty {
-		case auty.TyLogPropBoard:
-			{
-				var receipt auty.ReceiptProposalBoard
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				heightIndex := dapp.HeightIndexStr(receipt.Current.Height, int64(receipt.Current.Index))
-				err = table.Del([]byte(heightIndex))
-				if err != nil {
-					return nil, err
-				}
-			}
-		case auty.TyLogRvkPropBoard,
-			auty.TyLogVotePropBoard,
-			auty.TyLogTmintPropBoard:
-			{
-				var receipt auty.ReceiptProposalBoard
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				err = table.Replace(receipt.Prev)
-				if err != nil {
-					return nil, err
-				}
-			}
-		default:
-			break
-		}
-	}
-	kvs, err := table.Save()
-	if err != nil {
-		return nil, err
-	}
-	dbSet := &types.LocalDBSet{}
-	dbSet.KV = append(dbSet.KV, kvs...)
-	return dbSet, nil
-}
-
 func (a *Autonomy) getProposalBoard(req *types.ReqString) (types.Message, error) {
 	if req == nil {
 		return nil, types.ErrInvalidParam

plugin/dapp/autonomy/executor/board_test.go

@@ -136,11 +136,10 @@ func testexecLocalBoard(t *testing.T, auto bool) {
 }
 
 func TestExecDelLocalBoard(t *testing.T) {
-	testexecDelLocalBoard(t, false)
-	testexecDelLocalBoard(t, true)
+	testexecDelLocalBoard(t)
 }
 
-func testexecDelLocalBoard(t *testing.T, auto bool) {
+func testexecDelLocalBoard(t *testing.T) {
 	_, sdb, kvdb := util.CreateTestDB()
 	au := &Autonomy{}
 	au.SetLocalDB(kvdb)
@@ -164,32 +163,19 @@ func testexecDelLocalBoard(t *testing.T, auto bool) {
 		},
 	}
 
-	var set *types.LocalDBSet
-	var err error
 	// 先执行local然后进行删除
-	if !auto {
-		set, err := au.execLocalBoard(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
 
-		set, err = au.execDelLocalBoard(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalBoard(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err := au.execAutoLocalBoard(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execAutoDelLocal(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
+	set, err = au.execAutoDelLocal(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
 	// check
 	table := NewBoardTable(au.GetLocalDB())
@@ -215,44 +201,30 @@ func testexecDelLocalBoard(t *testing.T, auto bool) {
 			{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
 		}}
 	// 先执行local然后进行删除
-	if !auto {
-		set, err = au.execLocalBoard(recpt)
-
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalBoard(t, kvdb, cur)
 
-		set, err = au.execDelLocalBoard(recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		// 自动回退测试时候，需要先设置一个前置状态
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalBoard(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	// 自动回退测试时候，需要先设置一个前置状态
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalBoard(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		// 正常测试退回
-		tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err = au.execAutoLocalBoard(tx, recpt)
+	// 正常测试退回
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalBoard(tx, recpt)
 
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalBoard(t, kvdb, cur)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
+	// check
+	checkExecLocalBoard(t, kvdb, cur)
 
-		set, err = au.execAutoDelLocal(tx, recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
+	set, err = au.execAutoDelLocal(tx, recpt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 	// check
 	checkExecLocalBoard(t, kvdb, pre1)
 }

plugin/dapp/autonomy/executor/project.go

@@ -53,51 +53,6 @@ func (a *Autonomy) execLocalProject(receiptData *types.ReceiptData) (*types.Loca
 	return dbSet, nil
 }
 
-func (a *Autonomy) execDelLocalProject(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
-	table := NewProjectTable(a.GetLocalDB())
-	for _, log := range receiptData.Logs {
-		switch log.Ty {
-		case auty.TyLogPropProject:
-			{
-				var receipt auty.ReceiptProposalProject
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				heightIndex := dapp.HeightIndexStr(receipt.Current.Height, int64(receipt.Current.Index))
-				err = table.Del([]byte(heightIndex))
-				if err != nil {
-					return nil, err
-				}
-			}
-		case auty.TyLogRvkPropProject,
-			auty.TyLogVotePropProject,
-			auty.TyLogPubVotePropProject,
-			auty.TyLogTmintPropProject:
-			{
-				var receipt auty.ReceiptProposalProject
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				err = table.Replace(receipt.Prev)
-				if err != nil {
-					return nil, err
-				}
-			}
-		default:
-			break
-		}
-	}
-	kvs, err := table.Save()
-	if err != nil {
-		return nil, err
-	}
-	dbSet := &types.LocalDBSet{}
-	dbSet.KV = append(dbSet.KV, kvs...)
-	return dbSet, nil
-}
-
 func (a *Autonomy) getProposalProject(req *types.ReqString) (types.Message, error) {
 	if req == nil {
 		return nil, types.ErrInvalidParam

plugin/dapp/autonomy/executor/project_test.go

@@ -141,11 +141,10 @@ func testexecLocalProject(t *testing.T, auto bool) {
 }
 
 func TestExecDelLocalProject(t *testing.T) {
-	testexecDelLocalProject(t, false)
-	testexecDelLocalProject(t, true)
+	testexecDelLocalProject(t)
 }
 
-func testexecDelLocalProject(t *testing.T, auto bool) {
+func testexecDelLocalProject(t *testing.T) {
 	_, sdb, kvdb := util.CreateTestDB()
 	au := &Autonomy{}
 	au.SetLocalDB(kvdb)
@@ -171,32 +170,18 @@ func testexecDelLocalProject(t *testing.T, auto bool) {
 		},
 	}
 
-	var set *types.LocalDBSet
-	var err error
 	// 先执行local然后进行删除
-	if !auto {
-		set, err := au.execLocalProject(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-
-		set, err = au.execDelLocalProject(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalProject(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err := au.execAutoLocalProject(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execAutoDelLocal(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
+	set, err = au.execAutoDelLocal(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
 	// check
 	table := NewProjectTable(au.GetLocalDB())
@@ -222,44 +207,30 @@ func testexecDelLocalProject(t *testing.T, auto bool) {
 			{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
 		}}
 	// 先执行local然后进行删除
-	if !auto {
-		set, err = au.execLocalProject(recpt)
-
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalProject(t, kvdb, cur)
+	// 自动回退测试时候，需要先设置一个前置状态
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalProject(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execDelLocalProject(recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		// 自动回退测试时候，需要先设置一个前置状态
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalProject(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	// 正常测试退回
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalProject(tx, recpt)
 
-		// 正常测试退回
-		tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err = au.execAutoLocalProject(tx, recpt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
+	// check
+	checkExecLocalProject(t, kvdb, cur)
 
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalProject(t, kvdb, cur)
+	set, err = au.execAutoDelLocal(tx, recpt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execAutoDelLocal(tx, recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
 	checkExecLocalProject(t, kvdb, pre1)
 }
 

plugin/dapp/autonomy/executor/rule.go

@@ -52,50 +52,6 @@ func (a *Autonomy) execLocalRule(receiptData *types.ReceiptData) (*types.LocalDB
 	return dbSet, nil
 }
 
-func (a *Autonomy) execDelLocalRule(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
-	dbSet := &types.LocalDBSet{}
-	table := NewRuleTable(a.GetLocalDB())
-	for _, log := range receiptData.Logs {
-		switch log.Ty {
-		case auty.TyLogPropRule:
-			{
-				var receipt auty.ReceiptProposalRule
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				heightIndex := dapp.HeightIndexStr(receipt.Current.Height, int64(receipt.Current.Index))
-				err = table.Del([]byte(heightIndex))
-				if err != nil {
-					return nil, err
-				}
-			}
-		case auty.TyLogRvkPropRule,
-			auty.TyLogVotePropRule,
-			auty.TyLogTmintPropRule:
-			{
-				var receipt auty.ReceiptProposalRule
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				err = table.Replace(receipt.Prev)
-				if err != nil {
-					return nil, err
-				}
-			}
-		default:
-			break
-		}
-	}
-	kvs, err := table.Save()
-	if err != nil {
-		return nil, err
-	}
-	dbSet.KV = append(dbSet.KV, kvs...)
-	return dbSet, nil
-}
-
 func (a *Autonomy) getProposalRule(req *types.ReqString) (types.Message, error) {
 	if req == nil {
 		return nil, types.ErrInvalidParam
@@ -215,37 +171,6 @@ func saveCommentHeightIndex(res *auty.ReceiptProposalComment) (kvs []*types.KeyV
 	return kvs
 }
 
-func (a *Autonomy) execDelLocalCommentProp(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
-	dbSet := &types.LocalDBSet{}
-	var set []*types.KeyValue
-	for _, log := range receiptData.Logs {
-		switch log.Ty {
-		case auty.TyLogCommentProp:
-			{
-				var receipt auty.ReceiptProposalComment
-				err := types.Decode(log.Log, &receipt)
-				if err != nil {
-					return nil, err
-				}
-				kv := delCommentHeightIndex(&receipt)
-				set = append(set, kv...)
-			}
-		default:
-			break
-		}
-	}
-	dbSet.KV = append(dbSet.KV, set...)
-	return dbSet, nil
-}
-
-func delCommentHeightIndex(res *auty.ReceiptProposalComment) (kvs []*types.KeyValue) {
-	kv := &types.KeyValue{}
-	kv.Key = calcCommentHeight(res.Cmt.ProposalID, dapp.HeightIndexStr(res.Height, int64(res.Index)))
-	kv.Value = nil
-	kvs = append(kvs, kv)
-	return kvs
-}
-
 func (a *Autonomy) listProposalComment(req *auty.ReqQueryProposalComment) (types.Message, error) {
 	if req == nil {
 		return nil, types.ErrInvalidParam

plugin/dapp/autonomy/executor/rule_test.go

@@ -136,11 +136,10 @@ func testexecLocalRule(t *testing.T, auto bool) {
 }
 
 func TestExecDelLocalRule(t *testing.T) {
-	testexecDelLocalRule(t, false)
-	testexecDelLocalRule(t, true)
+	testexecDelLocalRule(t)
 }
 
-func testexecDelLocalRule(t *testing.T, auto bool) {
+func testexecDelLocalRule(t *testing.T) {
 	_, sdb, kvdb := util.CreateTestDB()
 	au := &Autonomy{}
 	au.SetLocalDB(kvdb)
@@ -163,32 +162,20 @@ func testexecDelLocalRule(t *testing.T, auto bool) {
 			{Ty: auty.TyLogPropRule, Log: types.Encode(receiptRule)},
 		},
 	}
-	var set *types.LocalDBSet
-	var err error
+
 	// 先执行local然后进行删除
-	if !auto {
-		set, err := au.execLocalRule(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
 
-		set, err = au.execDelLocalRule(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalRule(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err := au.execAutoLocalRule(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execAutoDelLocal(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
+	set, err = au.execAutoDelLocal(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
 	// check
 	table := NewRuleTable(au.GetLocalDB())
@@ -215,44 +202,29 @@ func testexecDelLocalRule(t *testing.T, auto bool) {
 			{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
 		}}
 	// 先执行local然后进行删除
-	if !auto {
-		set, err = au.execLocalRule(recpt)
-
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalRule(t, kvdb, cur)
-
-		set, err = au.execDelLocalRule(recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	} else {
-		// 自动回退测试时候，需要先设置一个前置状态
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err := au.execAutoLocalRule(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	// 自动回退测试时候，需要先设置一个前置状态
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalRule(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		// 正常测试退回
-		tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
-		set, err = au.execAutoLocalRule(tx, recpt)
+	// 正常测试退回
+	tx, err = types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
+	set, err = au.execAutoLocalRule(tx, recpt)
 
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-		// check
-		checkExecLocalRule(t, kvdb, cur)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
+	// check
+	checkExecLocalRule(t, kvdb, cur)
 
-		set, err = au.execAutoDelLocal(tx, recpt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
-	}
+	set, err = au.execAutoDelLocal(tx, recpt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
 	// check
 	checkExecLocalRule(t, kvdb, pre1)
@@ -462,11 +434,10 @@ func testexecLocalCommentProp(t *testing.T, auto bool) {
 }
 
 func TestExecDelLocalCommentProp(t *testing.T) {
-	testexecDelLocalCommentProp(t, false)
-	testexecDelLocalCommentProp(t, true)
+	testexecDelLocalCommentProp(t)
 }
 
-func testexecDelLocalCommentProp(t *testing.T, auto bool) {
+func testexecDelLocalCommentProp(t *testing.T) {
 	_, sdb, kvdb := util.CreateTestDB()
 	au := &Autonomy{}
 	au.SetLocalDB(kvdb)
@@ -488,30 +459,19 @@ func testexecDelLocalCommentProp(t *testing.T, auto bool) {
 		},
 	}
 	var set *types.LocalDBSet
-	var err error
 	// 先执行local然后进行删除
-	if !auto {
-		set, err = au.execLocalCommentProp(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
 
-		set, err = au.execDelLocalCommentProp(receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-	} else {
-		tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
-		assert.NoError(t, err)
+	tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
+	assert.NoError(t, err)
 
-		set, err = au.execAutoLocalCommentProp(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-		saveKvs(sdb, set.KV)
+	set, err = au.execAutoLocalCommentProp(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
+	saveKvs(sdb, set.KV)
 
-		set, err = au.execAutoDelLocal(tx, receipt)
-		require.NoError(t, err)
-		require.NotNil(t, set)
-	}
+	set, err = au.execAutoDelLocal(tx, receipt)
+	require.NoError(t, err)
+	require.NotNil(t, set)
 
 	// check
 	require.Equal(t, set.KV[0].Key, calcCommentHeight(propID,