modify ticket test

go.mod

@@ -3,7 +3,7 @@ module github.com/33cn/plugin
 go 1.12
 
 require (
-	github.com/33cn/chain33 v0.0.0-20190903065145-c663001cb18e
+	github.com/33cn/chain33 v0.0.0-20190906093700-93b043f5fce6
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/btcsuite/btcd v0.0.0-20181013004428-67e573d211ac

go.sum

 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/33cn/chain33 v0.0.0-20190903065145-c663001cb18e h1:n/QEXOOLoD7rnnub5eHzUKIG5e2dzbhVJoxpcu5e5ko=
-github.com/33cn/chain33 v0.0.0-20190903065145-c663001cb18e/go.mod h1:4I8n+Zyf3t0UKM5jjpqJY627Tub62oXkLsdzIv4r6rQ=
+github.com/33cn/chain33 v0.0.0-20190906093700-93b043f5fce6 h1:zj6rCGS9sowochmjveOoxhunvhqpkx1S6abhhhfS7KU=
+github.com/33cn/chain33 v0.0.0-20190906093700-93b043f5fce6/go.mod h1:4I8n+Zyf3t0UKM5jjpqJY627Tub62oXkLsdzIv4r6rQ=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7 h1:PqzgE6kAMi81xWQA2QIVxjWkFHptGgC547vchpUbtFo=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=

plugin/dapp/autonomy/commands/proposal_change.go

@@ -238,7 +238,7 @@ func addShowProposalChangeflags(cmd *cobra.Command) {
 	cmd.Flags().Uint32P("status", "s", 0, "status")
 	cmd.Flags().StringP("addr", "a", "", "address")
 	cmd.Flags().Int32P("count", "c", 1, "count, default is 1")
-	cmd.Flags().Int32P("direction", "d", -1, "direction, default is reserve")
+	cmd.Flags().Int32P("direction", "d", 0, "direction, default is reserve")
 	cmd.Flags().Int64P("height", "t", -1, "height, default is -1")
 	cmd.Flags().Int32P("index", "i", -1, "index, default is -1")
 }

plugin/dapp/autonomy/commands/proposal_rule.go

@@ -237,7 +237,7 @@ func addShowProposalRuleflags(cmd *cobra.Command) {
 	cmd.Flags().Uint32P("status", "s", 0, "status")
 	cmd.Flags().StringP("addr", "a", "", "address")
 	cmd.Flags().Int32P("count", "c", 1, "count, default is 1")
-	cmd.Flags().Int32P("direction", "d", -1, "direction, default is reserve")
+	cmd.Flags().Int32P("direction", "d", 0, "direction, default is reserve")
 	cmd.Flags().Int64P("height", "t", -1, "height, default is -1")
 	cmd.Flags().Int32P("index", "i", -1, "index, default is -1")
 }
@@ -402,7 +402,7 @@ func addShowProposalCommentflags(cmd *cobra.Command) {
 	cmd.Flags().StringP("proposalID", "p", "", "proposal ID")
 	cmd.MarkFlagRequired("proposalID")
 	cmd.Flags().Int32P("count", "c", 1, "count, default is 1")
-	cmd.Flags().Int32P("direction", "d", -1, "direction, default is reserve")
+	cmd.Flags().Int32P("direction", "d", 0, "direction, default is reserve")
 	cmd.Flags().Int64P("height", "t", -1, "height, default is -1")
 	cmd.Flags().Int64P("index", "i", -1, "index, default is -1")
 }

plugin/dapp/ticket/executor/ticketdb.go

@@ -346,13 +346,13 @@ func (action *Action) TicketMiner(miner *ty.TicketMiner, index int) (*types.Rece
 		addr := types.MGStr("mver.consensus.fundKeyAddr", action.height)
 		receipt2, err = action.coinsAccount.ExecIssueCoins(addr, cfg.CoinDevFund)
 		if err != nil {
-			tlog.Error("TicketMiner.ExecDepositFrozen fund to autonomy fund", "addr", addr)
+			tlog.Error("TicketMiner.ExecDepositFrozen fund to autonomy fund", "addr", addr, "error", err)
 			return nil, err
 		}
 	} else {
 		receipt2, err = action.coinsAccount.ExecDepositFrozen(types.GetFundAddr(), action.execaddr, cfg.CoinDevFund)
 		if err != nil {
-			tlog.Error("TicketMiner.ExecDepositFrozen fund", "addr", types.GetFundAddr(), "execaddr", action.execaddr)
+			tlog.Error("TicketMiner.ExecDepositFrozen fund", "addr", types.GetFundAddr(), "execaddr", action.execaddr, "error", err)
 			return nil, err
 		}
 	}

plugin/dapp/ticket/rpc/jrpc_channel_test.go

@@ -17,12 +17,18 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestJRPCChannel(t *testing.T) {
-	// 启动RPCmocker
-	mocker := testnode.New("--notset--", nil)
-	defer mocker.Close()
+var mocker *testnode.Chain33Mock
+
+func TestMain(m *testing.M) {
+	cfg, sub := testnode.GetDefaultConfig()
+	cfg.Consensus.Name = "ticket"
+	mocker = testnode.NewWithConfig(cfg, sub, nil)
 	mocker.Listen()
+	m.Run()
+	mocker.Close()
+}
 
+func TestJRPCChannel(t *testing.T) {
 	jrpcClient := mocker.GetJSONC()
 
 	testCases := []struct {

plugin/dapp/ticket/rpc/rpc_real_test.go

@@ -10,22 +10,15 @@ import (
 
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	_ "github.com/33cn/chain33/system"
-	"github.com/33cn/chain33/util/testnode"
 	_ "github.com/33cn/plugin/plugin"
 	ty "github.com/33cn/plugin/plugin/dapp/ticket/types"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestNewTicket(t *testing.T) {
-	cfg, sub := testnode.GetDefaultConfig()
-	cfg.Consensus.Name = "ticket"
-	mock33 := testnode.NewWithConfig(cfg, sub, nil)
-	defer mock33.Close()
-	mock33.WaitHeight(5)
-	mock33.Listen()
 	//选票(可以用hotwallet 关闭选票)
-	in := &ty.TicketClose{MinerAddress: mock33.GetHotAddress()}
+	in := &ty.TicketClose{MinerAddress: mocker.GetHotAddress()}
 	var res rpctypes.ReplyHashes
-	err := mock33.GetJSONC().Call("ticket.CloseTickets", in, &res)
+	err := mocker.GetJSONC().Call("ticket.CloseTickets", in, &res)
 	assert.Nil(t, err)
 }