Commit 146154b7 authored by jiangpeng's avatar jiangpeng Committed by 33cn

update CreateTxGroup

parent bdbcd763
...@@ -105,7 +105,7 @@ func createCrossParaTempTx(to string, amount int64) (*types.Transaction, error) ...@@ -105,7 +105,7 @@ func createCrossParaTempTx(to string, amount int64) (*types.Transaction, error)
func createTxsGroup(txs []*types.Transaction) ([]*types.Transaction, error) { func createTxsGroup(txs []*types.Transaction) ([]*types.Transaction, error) {
group, err := types.CreateTxGroup(txs) group, err := types.CreateTxGroup(txs, types.GInt("MinFee"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -262,7 +262,7 @@ func (client *commitMsgClient) getTxsGroup(txsArr *types.Transactions) (*types.T ...@@ -262,7 +262,7 @@ func (client *commitMsgClient) getTxsGroup(txsArr *types.Transactions) (*types.T
return tx, nil return tx, nil
} }
group, err := types.CreateTxGroup(txsArr.Txs) group, err := types.CreateTxGroup(txsArr.Txs, types.GInt("MinFee"))
if err != nil { if err != nil {
plog.Error("para CreateTxGroup", "err", err.Error()) plog.Error("para CreateTxGroup", "err", err.Error())
return nil, err return nil, err
......
...@@ -726,7 +726,7 @@ func createCrossCommitTx(s suite.Suite) (*types.Transaction, error) { ...@@ -726,7 +726,7 @@ func createCrossCommitTx(s suite.Suite) (*types.Transaction, error) {
} }
func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transaction, error) { func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transaction, error) {
group, err := types.CreateTxGroup(txs) group, err := types.CreateTxGroup(txs, types.GInt("MinFee"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -196,7 +196,7 @@ func TestRealNodeMempool(t *testing.T) { ...@@ -196,7 +196,7 @@ func TestRealNodeMempool(t *testing.T) {
//发送交易组 //发送交易组
tx1 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000) tx1 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000)
tx2 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000) tx2 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000)
txgroup, err := types.CreateTxGroup([]*types.Transaction{tx1, tx2}) txgroup, err := types.CreateTxGroup([]*types.Transaction{tx1, tx2}, types.GInt("MinFee"))
if err != nil { if err != nil {
log.Println(err) log.Println(err)
continue continue
......
...@@ -185,7 +185,7 @@ func TestRealNodeMempool(t *testing.T) { ...@@ -185,7 +185,7 @@ func TestRealNodeMempool(t *testing.T) {
//发送交易组 //发送交易组
tx1 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000) tx1 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000)
tx2 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000) tx2 := util.CreateCoinsTx(priv, mock33.GetGenesisAddress(), types.Coin/1000)
txgroup, err := types.CreateTxGroup([]*types.Transaction{tx1, tx2}) txgroup, err := types.CreateTxGroup([]*types.Transaction{tx1, tx2}, types.GInt("MinFee"))
if err != nil { if err != nil {
log.Println(err) log.Println(err)
continue continue
......
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