Merge remote-tracking branch 'origin/autonomy_fund' into autonomy_fund

plugin/dapp/autonomy/executor/boardaction.go

@@ -255,7 +255,6 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-
 	if cur.VoteResult.TotalVotes != 0 &&
 		cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes != 0 &&
 		float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes)/float32(cur.VoteResult.TotalVotes) > float32(pubAttendRatio)/100.0 &&

plugin/dapp/autonomy/executor/boardaction_test.go

@@ -408,7 +408,7 @@ func voteProposalBoard(t *testing.T, env *ExecEnv, exec drivers.Driver, stateDB
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)
 	// status
@@ -485,7 +485,7 @@ func terminateProposalBoard(t *testing.T, env *ExecEnv, exec drivers.Driver, sta
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)
 }

plugin/dapp/autonomy/executor/changeaction.go

@@ -5,10 +5,11 @@
 package executor
 
 import (
+	"sort"
+
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/types"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
-	"sort"
 )
 
 func (a *action) propChange(prob *auty.ProposalChange) (*types.Receipt, error) {
@@ -177,7 +178,6 @@ func (a *action) votePropChange(voteProb *auty.VoteProposalChange) (*types.Recei
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-
 	if cur.VoteResult.TotalVotes != 0 &&
 		float32(cur.VoteResult.ApproveVotes)/float32(cur.VoteResult.TotalVotes) > float32(cur.CurRule.BoardApproveRatio)/100.0 {
 		cur.VoteResult.Pass = true

plugin/dapp/autonomy/executor/changeaction_test.go

@@ -263,7 +263,7 @@ func voteProposalChange(t *testing.T, env *ExecEnv, exec drivers.Driver, stateDB
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)
 	// status
@@ -348,7 +348,7 @@ func terminateProposalChange(t *testing.T, env *ExecEnv, exec drivers.Driver, st
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)
 }

plugin/dapp/autonomy/executor/projectaction.go

@@ -77,7 +77,6 @@ func (a *action) propProject(prob *auty.ProposalProject) (*types.Receipt, error)
 	logs = append(logs, receipt.Logs...)
 	kv = append(kv, receipt.KV...)
 
-
 	var isPubVote bool
 	if prob.Amount >= rule.LargeProjectAmount {
 		isPubVote = true

plugin/dapp/autonomy/executor/projectaction_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-
 const (
 	testProjectAmount int64 = types.Coin * 100  // 工程需要资金
 	testFundAmount    int64 = types.Coin * 1000 // 工程需要资金
@@ -256,7 +255,7 @@ func testPropProject(t *testing.T, env *ExecEnv, exec drivers.Driver, stateDB db
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
-	assert.Equal(t, proposalAmount + testFundAmount, account.Balance)
+	assert.Equal(t, proposalAmount+testFundAmount, account.Balance)
 }
 
 func propProjectTx(parm *auty.ProposalProject) (*types.Transaction, error) {
@@ -448,11 +447,11 @@ func checkVoteProposalProjectResult(t *testing.T, stateDB dbm.KV, proposalID str
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(AddrD)
-	assert.Equal(t, total + testProjectAmount, account.Balance)
+	assert.Equal(t, total+testProjectAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
-	assert.Equal(t, testFundAmount + proposalAmount - testProjectAmount, account.Balance)
+	assert.Equal(t, testFundAmount+proposalAmount-testProjectAmount, account.Balance)
 	// 更新董事会累计审批金
 	value, err = stateDB.Get(activeBoardID())
 	assert.NoError(t, err)
@@ -565,11 +564,11 @@ func checkPubVoteProposalProjectResult(t *testing.T, stateDB dbm.KV, proposalID
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(AddrD)
 	assert.Equal(t, total, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
-	assert.Equal(t, testFundAmount + proposalAmount, account.Balance)
+	assert.Equal(t, testFundAmount+proposalAmount, account.Balance)
 
 	// 更新董事会累计审批金
 	value, err = stateDB.Get(activeBoardID())
@@ -643,9 +642,9 @@ func terminateProposalProject(t *testing.T, env *ExecEnv, exec drivers.Driver, s
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
-	assert.Equal(t, testFundAmount + proposalAmount, account.Balance)
+	assert.Equal(t, testFundAmount+proposalAmount, account.Balance)
 
 	// check Project
 	au := &Autonomy{

plugin/dapp/autonomy/executor/ruleaction.go

@@ -319,7 +319,6 @@ func (a *action) tmintPropRule(tmintProb *auty.TerminateProposalRule) (*types.Re
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-
 	cur.Status = auty.AutonomyStatusTmintPropRule
 
 	kv = append(kv, &types.KeyValue{Key: propRuleID(tmintProb.ProposalID), Value: types.Encode(cur)})

plugin/dapp/autonomy/executor/ruleaction_test.go

@@ -357,7 +357,7 @@ func voteProposalRule(t *testing.T, env *ExecEnv, exec drivers.Driver, stateDB d
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)
 	// status
@@ -448,7 +448,7 @@ func terminateProposalRule(t *testing.T, env *ExecEnv, exec drivers.Driver, stat
 	accCoin := account.NewCoinsAccount()
 	accCoin.SetDB(stateDB)
 	account := accCoin.LoadAccount(AddrA)
-	assert.Equal(t, total - proposalAmount, account.Balance)
+	assert.Equal(t, total-proposalAmount, account.Balance)
 	account = accCoin.LoadAccount(address.ExecAddress(auty.AutonomyX))
 	assert.Equal(t, proposalAmount, account.Balance)