Commit 0bddd2e3 authored by caopingcp's avatar caopingcp Committed by vipwzw

fix ticket test

parent 808a5d90
...@@ -160,7 +160,7 @@ chain33_GetAccounts() { ...@@ -160,7 +160,7 @@ chain33_GetAccounts() {
chain33_LastBlockhash() { chain33_LastBlockhash() {
local MAIN_HTTP=$1 local MAIN_HTTP=$1
result=$(curl -ksd '{"method":"Chain33.GetLastHeader","params":[{}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.hash") result=$(curl -ksd '{"method":"Chain33.GetLastHeader","params":[{}]}' -H 'content-type:text/plain;' "${MAIN_HTTP}" | jq -r ".result.hash")
LAST_BLOCK_HASH=$result LAST_BLOCK_HASH=$result
echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######" echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######"
} }
...@@ -22,6 +22,25 @@ import ( ...@@ -22,6 +22,25 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
) )
var cfgstring = `
Title="test"
[mver.consensus]
fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
coinReward = 18
coinDevFund = 12
ticketPrice = 10000
powLimitBits = "0x1f00ffff"
retargetAdjustmentFactor = 4
futureBlockTime = 16
ticketFrozenTime = 5
ticketWithdrawTime = 10
ticketMinerWaitTime = 2
maxTxNumber = 10000
targetTimespan = 2304
targetTimePerBlock = 16
`
func newGrpc(api *mocks.QueueProtocolAPI) *channelClient { func newGrpc(api *mocks.QueueProtocolAPI) *channelClient {
return &channelClient{ return &channelClient{
ChannelClient: rpctypes.ChannelClient{QueueProtocolAPI: api}, ChannelClient: rpctypes.ChannelClient{QueueProtocolAPI: api},
...@@ -45,6 +64,9 @@ func TestChannelClient_BindMiner(t *testing.T) { ...@@ -45,6 +64,9 @@ func TestChannelClient_BindMiner(t *testing.T) {
storevalue.Values = append(storevalue.Values, accv) storevalue.Values = append(storevalue.Values, accv)
api.On("StoreGet", mock.Anything).Return(storevalue, nil) api.On("StoreGet", mock.Anything).Return(storevalue, nil)
types.SetTitleOnlyForTest("test")
types.InitCfgString(cfgstring)
//var addrs = make([]string, 1) //var addrs = make([]string, 1)
//addrs = append(addrs, "1Jn2qu84Z1SUUosWjySggBS9pKWdAP3tZt") //addrs = append(addrs, "1Jn2qu84Z1SUUosWjySggBS9pKWdAP3tZt")
var in = &ty.ReqBindMiner{ var in = &ty.ReqBindMiner{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment