Fix some tests

Signed-off-by: Jakub Sztandera <[email protected]>
filecoin-project · Aug 6, 2020 · 6562b7a · 6562b7a
1 parent b384ac6
commit 6562b7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/chain/types/message.go b/chain/types/message.go
@@ -141,7 +141,7 @@ func (m *Message) ValidForBlockInclusion(minGas int64) error {
 		return xerrors.New("'Value' field cannot be greater than total filecoin supply")
 	}
 
-	if m.GasPrice.LessThan(big.Zero()) {
+	if m.GasFeeCap.LessThan(big.Zero()) {
 		return xerrors.New("'GasPrice' field cannot be negative")
 	}
 

diff --git a/node/impl/full/mpool.go b/node/impl/full/mpool.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/messagepool"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -118,6 +119,12 @@ func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message) (*t
 		}
 		msg.GasPrice = gasPrice
 	}
+	if msg.GasPremium == types.EmptyInt || types.BigCmp(msg.GasPremium, types.NewInt(0)) == 0 {
+		msg.GasPremium = types.NewInt(100)
+	}
+	if msg.GasFeeCap == types.EmptyInt || types.BigCmp(msg.GasFeeCap, types.NewInt(0)) == 0 {
+		msg.GasFeeCap = types.NewInt(10 * build.InitialBaseFee)
+	}
 
 	return a.Mpool.PushWithNonce(ctx, msg.From, func(from address.Address, nonce uint64) (*types.SignedMessage, error) {
 		msg.Nonce = nonce