cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Fix some messagepool tests

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-08-06 21:25:30 +02:00
parent 6562b7a4bc
commit d6765847df
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
4 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/messagepool/messagepool_test.go
View File

@ -87,7 +87,7 @@ func (tma *testMpoolAPI) PubSubPublish(string, []byte) error {
func (tma *testMpoolAPI) StateGetActor(addr address.Address, ts *types.TipSet) (*types.Actor, error) {
balance, ok := tma.balance[addr]
if !ok {
balance = types.NewInt(90000000)
balance = types.NewInt(1000e6)
tma.balance[addr] = balance
}
return &types.Actor{

15
chain/messagepool/selection.go
View File

@ -1,7 +1,6 @@
package messagepool
import (
"context"
"math/big"
"sort"
"time"
@ -233,19 +232,7 @@ func (mp *MessagePool) getPendingMessages(curTs, ts *types.TipSet) (map[address.
}
func (mp *MessagePool) getGasReward(msg *types.SignedMessage, ts *types.TipSet) *big.Int {
al := func(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*types.Actor, error) {
return mp.api.StateGetActor(addr, ts)
}
gasUsed, err := gasguess.GuessGasUsed(context.TODO(), types.EmptyTSK, msg, al)
if err != nil {
gasUsed = int64(gasguess.MaxGas)
if gasUsed > msg.Message.GasLimit/2 {
gasUsed = msg.Message.GasLimit / 2
}
// if we start seeing this warning we may have a problem with spammers!
log.Warnf("Cannot guess gas usage for message: %s; using %d", err, gasUsed)
}
gasReward := abig.Mul(msg.Message.GasPrice, types.NewInt(uint64(gasUsed)))
gasReward := abig.Mul(msg.Message.GasPremium, types.NewInt(uint64(msg.Message.GasLimit)))
return gasReward.Int
}

3
chain/messagepool/selection_test.go
View File

@ -26,7 +26,8 @@ func makeTestMessage(w *wallet.Wallet, from, to address.Address, nonce uint64, g
Value: types.FromFil(0),
Nonce: nonce,
GasLimit: gasLimit,
GasPrice: types.NewInt(gasPrice),
GasFeeCap: types.NewInt(gasPrice + 100),
GasPremium: types.NewInt(gasPrice),
}
sig, err := w.Sign(context.TODO(), from, msg.Cid().Bytes())
if err != nil {

3
chain/types/mock/chain.go
View File

@ -28,7 +28,8 @@ func MkMessage(from, to address.Address, nonce uint64, w *wallet.Wallet) *types.
Value: types.NewInt(1),
Nonce: nonce,
GasLimit: 1000000,
GasPrice: types.NewInt(0),
GasFeeCap: types.NewInt(100),
GasPremium: types.NewInt(1),
}
sig, err := w.Sign(context.TODO(), from, msg.Cid().Bytes())