fix ut

Author: mdj33

build/docker-compose.sh

@@ -101,6 +101,9 @@ function base_init() {
 
     sed -i $sedfix 's/^enableTLS=.*/enableTLS=true/g' ${testtoml}
 
+    #autonomy config
+    sed -i $sedfix 's/^autonomyExec =.*/autonomyExec=""/g' chain33.toml
+
     cp ${testtoml} ${testtomlsolo}
     #consens
     consens_init "solo"

system/dapp/manage/executor/exec.go

@@ -30,7 +30,9 @@ func (c *Manage) Exec_Modify(manageAction *types.ModifyConfig, tx *types.Transac
 	types.AssertConfig(c.GetAPI())
 	cfg := c.GetAPI().GetConfig()
 
-	if cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageAutonomyEnable) {
+	confManager := types.ConfSub(cfg, mty.ManageX)
+	autonomyExec := confManager.GStr(types.AutonomyCfgKey)
+	if cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageAutonomyEnable) && len(autonomyExec) > 0 {
 		return nil, errors.Wrapf(types.ErrNotAllow, "not allow this op directly in new version")
 	}
 

system/dapp/manage/executor/rpc_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	rpctypes "github.com/33cn/chain33/rpc/types"
-	mty "github.com/33cn/chain33/system/dapp/manage/types"
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"
 	"github.com/33cn/chain33/util/testnode"
@@ -13,9 +12,7 @@ import (
 
 func TestManageConfig(t *testing.T) {
 	cfg := testnode.GetDefaultConfig()
-	cfg.SetTitleOnlyForTest("chain33")
 	mocker := testnode.NewWithConfig(cfg, nil)
-	mocker.GetAPI().GetConfig().SetDappFork(mty.ManageX, mty.ForkManageAutonomyEnable, types.MaxHeight)
 	defer mocker.Close()
 	mocker.Listen()
 	err := mocker.SendHot()
@@ -155,9 +152,7 @@ func TestManageConfig(t *testing.T) {
 
 func TestTokenFinisher(t *testing.T) {
 	cfg := testnode.GetDefaultConfig()
-	cfg.SetTitleOnlyForTest("chain33")
 	mocker := testnode.NewWithConfig(cfg, nil)
-	mocker.GetAPI().GetConfig().SetDappFork(mty.ManageX, mty.ForkManageAutonomyEnable, types.MaxHeight)
 	defer mocker.Close()
 	mocker.Listen()
 	err := mocker.SendHot()

types/defaultcfg.go

@@ -222,7 +222,7 @@ superManager=[
     "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
-autonomyExec="autonomy"
+autonomyExec=""
 
 [exec.sub.autonomy]
 total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"