openatom_foundation
/
bitxhub
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(contracts): fix a bug where the proposal priority in rule governance was not valid 

Priority invalidation due to a wrong object ID in rule governance.
This commit is contained in:
dawn-to-dusk 2021-04-29 16:44:01 +08:00
parent 18eecb2758
commit ef8d80986f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/executor/contracts/governance.go
View File

@ -12,7 +12,6 @@ import (
"github.com/meshplus/bitxhub-model/constant"
"github.com/meshplus/bitxhub-model/pb"
"github.com/meshplus/bitxhub/internal/repo"
"github.com/tidwall/gjson"
)
type Governance struct {
@ -126,8 +125,7 @@ func (g *Governance) SubmitProposal(from, eventTyp, des, typ, objId string, extr
}
// 3. lock low-priority proposals
chainId := gjson.Get(string(extra), "id").String()
lockPId, err := g.lockLowPriorityProposal(chainId, eventTyp)
lockPId, err := g.lockLowPriorityProposal(objId, eventTyp)
if err != nil {
return boltvm.Error("close low priority proposals error:" + err.Error())
}

4
internal/executor/contracts/governance_test.go
View File

@ -562,9 +562,9 @@ func TestGovernance_SubmitProposal_LockLowPriorityProposal(t *testing.T) {
mockStub.EXPECT().AddObject(gomock.Any(), gomock.Any()).AnyTimes()
mockStub.EXPECT().CurrentCaller().Return("").AnyTimes()
res := g.SubmitProposal(idExistent, string(governance.EventUpdate), "des", string(AppchainMgr), "objId", chainData)
res := g.SubmitProposal(idExistent, string(governance.EventUpdate), "des", string(AppchainMgr), appchainMethod, chainData)
assert.False(t, res.Ok, string(res.Result))
res = g.SubmitProposal(idExistent, string(governance.EventLogout), "des", string(AppchainMgr), "objId", chainData)
res = g.SubmitProposal(idExistent, string(governance.EventLogout), "des", string(AppchainMgr), appchainMethod, chainData)
assert.True(t, res.Ok, string(res.Result))
}