Commit c7b89cae authored by vipwzw's avatar vipwzw

auto ci

parent 752dfbd8
......@@ -286,7 +286,6 @@ func (client *commitMsgClient) singleCalcTx(status *pt.ParacrossNodeStatus) (*ty
}
func (client *commitMsgClient) sendCommitMsg(ch chan *types.Transaction) {
var err error
var tx *types.Transaction
......@@ -297,7 +296,7 @@ out:
select {
case tx = <-ch:
err = client.sendCommitMsgTx(tx)
if err != nil && (err != types.ErrBalanceLessThanTenTimesFee && err != types.ErrNoBalance ) {
if err != nil && (err != types.ErrBalanceLessThanTenTimesFee && err != types.ErrNoBalance) {
resendTimer = time.After(time.Second * 2)
}
case <-resendTimer:
......
......@@ -112,7 +112,7 @@ func setMinerTxResult(payload *pt.ParacrossMinerAction, txs []*types.Transaction
}
crossTxHashs := FilterParaMainCrossTxHashes(types.GetTitle(), txs)
payload.Status.TxHashs = paraTxHashs
payload.Status.TxResult = util.CalcBitMap(paraTxHashs,curTxHashs, receipts)
payload.Status.TxResult = util.CalcBitMap(paraTxHashs, curTxHashs, receipts)
payload.Status.CrossTxHashs = crossTxHashs
payload.Status.CrossTxResult = util.CalcBitMap(crossTxHashs, curTxHashs, receipts)
......
......@@ -152,7 +152,7 @@ func createRawCommitTx(status *ParacrossNodeStatus, name string, fee int64) (*ty
Payload: types.Encode(action),
Fee: fee,
To: address.ExecAddress(name),
Expire: types.Now().Unix() + int64(120), //120s
Expire: types.Now().Unix() + int64(120), //120s
}
tx, err := types.FormatTx(name, tx)
if err != nil {
......
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