Commit cab37049 authored by vipwzw's avatar vipwzw

fixbug para cross

parent b48fae98
...@@ -219,7 +219,7 @@ func createTxsGroup(txs []*types.Transaction) ([]*types.Transaction, error) { ...@@ -219,7 +219,7 @@ func createTxsGroup(txs []*types.Transaction) ([]*types.Transaction, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = group.Check(0, types.GInt("MinFee")) err = group.Check(0, types.GInt("MinFee"), types.GInt("MaxTxFee"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -5,27 +5,23 @@ ...@@ -5,27 +5,23 @@
package executor package executor
import ( import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
//"github.com/stretchr/testify/mock"
"testing"
apimock "github.com/33cn/chain33/client/mocks"
"github.com/33cn/chain33/common/crypto"
dbm "github.com/33cn/chain33/common/db"
dbmock "github.com/33cn/chain33/common/db/mocks"
"github.com/33cn/chain33/types"
"bytes" "bytes"
"math/rand" "math/rand"
"testing"
"time" "time"
apimock "github.com/33cn/chain33/client/mocks"
"github.com/33cn/chain33/common" "github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/address" "github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto"
dbm "github.com/33cn/chain33/common/db"
dbmock "github.com/33cn/chain33/common/db/mocks"
"github.com/33cn/chain33/common/log" "github.com/33cn/chain33/common/log"
mty "github.com/33cn/chain33/system/dapp/manage/types" mty "github.com/33cn/chain33/system/dapp/manage/types"
"github.com/33cn/chain33/types"
pt "github.com/33cn/plugin/plugin/dapp/paracross/types" pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
) )
// 构造一个4个节点的平行链数据, 进行测试 // 构造一个4个节点的平行链数据, 进行测试
...@@ -528,7 +524,7 @@ func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transacti ...@@ -528,7 +524,7 @@ func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transacti
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = group.Check(0, types.GInt("MinFee")) err = group.Check(0, types.GInt("MinFee"), types.GInt("MaxTxFee"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
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