diff --git a/gateway/mock_gateway_client.go b/gateway/mock_gateway_client.go index 891fcec5..7b38e34e 100644 --- a/gateway/mock_gateway_client.go +++ b/gateway/mock_gateway_client.go @@ -48,11 +48,11 @@ func (m *MockWalletProxy) AddAddress(addrs []address.Address) error { return nil } -func (m *MockWalletProxy) RemoveAddress(ctx context.Context, addr address.Address) error { +func (m *MockWalletProxy) RemoveAddress(ctx context.Context, addrs []address.Address) error { m.l.Lock() defer m.l.Unlock() - if _, ok := m.signers[addr]; ok { + for _, addr := range addrs { delete(m.signers, addr) } diff --git a/go.mod b/go.mod index cd829134..9438431d 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/filecoin-project/specs-actors v0.9.15 github.com/filecoin-project/specs-actors/v5 v5.0.6 github.com/filecoin-project/specs-actors/v6 v6.0.2 - github.com/filecoin-project/venus v1.7.1-0.20220909053825-c1c66a0ddcee - github.com/filecoin-project/venus-auth v1.7.0 + github.com/filecoin-project/venus v1.7.1-0.20220909084750-9361a9370b46 + github.com/filecoin-project/venus-auth v1.7.1-0.20220914025723-3667cbc2b890 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/hunjixin/automapper v0.0.0-20191127090318-9b979ce72ce2 diff --git a/go.sum b/go.sum index 0a850ca4..189a9ee2 100644 --- a/go.sum +++ b/go.sum @@ -422,11 +422,12 @@ github.com/filecoin-project/specs-storage v0.4.1/go.mod h1:Z2eK6uMwAOSLjek6+sy0j github.com/filecoin-project/storetheindex v0.3.5/go.mod h1:0r3d0kSpK63O6AvLr1CjAINLi+nWD49clzcnKV+GLpI= github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E= github.com/filecoin-project/venus v1.2.4/go.mod h1:hJULXHGAnWuq5S5KRtPkwbT8DqgM9II7NwyNU7t59D0= -github.com/filecoin-project/venus v1.7.1-0.20220909053825-c1c66a0ddcee h1:IISZ8a27HgXISKhjdRANQngGBjUReyUYcLl3nFD4miw= -github.com/filecoin-project/venus v1.7.1-0.20220909053825-c1c66a0ddcee/go.mod h1:j6gvRtZxBEnNWRjcpk0qagr9XLaC3or/VXKenNT2W2s= +github.com/filecoin-project/venus v1.7.1-0.20220909084750-9361a9370b46 h1:0mqFl2EUTT0e6AnjDfsp9dAnhM1WT0fsH81TArtTtAU= +github.com/filecoin-project/venus v1.7.1-0.20220909084750-9361a9370b46/go.mod h1:j6gvRtZxBEnNWRjcpk0qagr9XLaC3or/VXKenNT2W2s= github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU= -github.com/filecoin-project/venus-auth v1.7.0 h1:0ljb7feFJ8buV5M/OX2SfjI1T9n/R/XrjQol20v04b8= github.com/filecoin-project/venus-auth v1.7.0/go.mod h1:eqjx1U5sJ/3bqqc3PDJutap9A1GAO4fXVt25J6Sm9Fk= +github.com/filecoin-project/venus-auth v1.7.1-0.20220914025723-3667cbc2b890 h1:WQEAQUzz+RRF4XT41YmEgeFZdXCWcF3sbG7nA69kVFI= +github.com/filecoin-project/venus-auth v1.7.1-0.20220914025723-3667cbc2b890/go.mod h1:DR/RdqOycbMyQ4/oKGYMGlh8qwpLw8A40eL1Qbj7KpQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= diff --git a/integration_test/message_test.go b/integration_test/message_test.go index d039fc5f..cfdbf865 100644 --- a/integration_test/message_test.go +++ b/integration_test/message_test.go @@ -10,17 +10,18 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/venus/pkg/constants" - "github.com/filecoin-project/venus/venus-shared/testutil" - shared "github.com/filecoin-project/venus/venus-shared/types" - types "github.com/filecoin-project/venus/venus-shared/types/messager" "github.com/stretchr/testify/assert" "gorm.io/gorm" "github.com/filecoin-project/venus-messager/config" "github.com/filecoin-project/venus-messager/service" "github.com/filecoin-project/venus-messager/testhelper" + + "github.com/filecoin-project/venus/pkg/constants" "github.com/filecoin-project/venus/venus-shared/api/messager" + "github.com/filecoin-project/venus/venus-shared/testutil" + shared "github.com/filecoin-project/venus/venus-shared/types" + types "github.com/filecoin-project/venus/venus-shared/types/messager" ) func TestMessageAPI(t *testing.T) { @@ -35,10 +36,9 @@ func TestMessageAPI(t *testing.T) { go ms.start(ctx) assert.NoError(t, <-ms.appStartErr) - account := defaultLocalToken addrCount := 10 addrs := testhelper.RandAddresses(t, addrCount) - assert.NoError(t, ms.walletCli.AddAddress(account, addrs)) + assert.NoError(t, ms.walletCli.AddAddress(addrs)) assert.NoError(t, ms.fullNode.AddActors(addrs)) api, closer, err := newMessagerClient(ctx, ms.port, ms.token) @@ -51,35 +51,29 @@ func TestMessageAPI(t *testing.T) { t.Run("test push message with id", func(t *testing.T) { testPushMessageWithID(ctx, t, api, addrs) }) - t.Run("test force push message", func(t *testing.T) { - testForcePushMessage(ctx, t, api, addrs, account) - }) - t.Run("test force push message with id", func(t *testing.T) { - testForcePushMessageWithID(ctx, t, api, addrs, account) - }) t.Run("test has message by uid", func(t *testing.T) { - testHasMessageByUid(ctx, t, api, addrs, account) + testHasMessageByUid(ctx, t, api, addrs) }) t.Run("test get message by uid", func(t *testing.T) { testGetMessageByUid(ctx, t, api, addrs) }) t.Run("test wait message", func(t *testing.T) { - testWaitMessage(ctx, t, api, addrs, account) + testWaitMessage(ctx, t, api, addrs) }) t.Run("test get message by signed cid", func(t *testing.T) { - testGetMessageBySignedCID(ctx, t, api, addrs, account) + testGetMessageBySignedCID(ctx, t, api, addrs) }) t.Run("test get message By unsigned cid", func(t *testing.T) { - testGetMessageByUnsignedCID(ctx, t, api, addrs, account) + testGetMessageByUnsignedCID(ctx, t, api, addrs) }) t.Run("test get message by from and nonce", func(t *testing.T) { - testGetMessageByFromAndNonce(ctx, t, api, addrs, account) + testGetMessageByFromAndNonce(ctx, t, api, addrs) }) t.Run("test list message", func(t *testing.T) { - testListMessage(ctx, t, api, addrs, account) + testListMessage(ctx, t, api, addrs) }) t.Run("test list message by from state", func(t *testing.T) { - testListMessageByFromState(ctx, t, api, addrs, account) + testListMessageByFromState(ctx, t, api, addrs) }) t.Run("test list message by address", func(t *testing.T) { testListMessageByAddress(ctx, t, api) @@ -145,43 +139,10 @@ func testPushMessageWithID(ctx context.Context, t *testing.T, api messager.IMess } } -func testForcePushMessage(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { +func testHasMessageByUid(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { msgs := genMessageWithAddress(addrs) - sendSpecs := testhelper.MockSendSpecs() - for _, msg := range msgs { - meta := sendSpecs[rand.Intn(len(sendSpecs))] - id, err := api.ForcePushMessage(ctx, account, &msg.Message, meta) - assert.NoError(t, err) - - res, err := api.GetMessageByUid(ctx, id) - assert.NoError(t, err) - checkUnsignedMsg(t, &msg.Message, &res.Message) - checkSendSpec(t, meta, res.Meta) - } -} - -func testForcePushMessageWithID(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessageWithAddress(addrs) - sendSpecs := testhelper.MockSendSpecs() - - for _, msg := range msgs { - meta := sendSpecs[rand.Intn(len(sendSpecs))] - id, err := api.ForcePushMessageWithId(ctx, account, msg.ID, &msg.Message, meta) - assert.NoError(t, err) - assert.Equal(t, msg.ID, id) - - res, err := api.GetMessageByUid(ctx, msg.ID) - assert.NoError(t, err) - checkUnsignedMsg(t, &msg.Message, &res.Message) - checkSendSpec(t, meta, res.Meta) - } -} - -func testHasMessageByUid(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessageWithAddress(addrs) - for _, msg := range msgs { - id, err := api.ForcePushMessageWithId(ctx, account, msg.ID, &msg.Message, nil) + id, err := api.PushMessageWithId(ctx, msg.ID, &msg.Message, nil) assert.NoError(t, err) assert.Equal(t, msg.ID, id) @@ -215,13 +176,13 @@ func testGetMessageByUid(ctx context.Context, t *testing.T, api messager.IMessag assert.Nil(t, res) } -func testWaitMessage(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { +func testWaitMessage(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { msgs := genMessageWithAddress(addrs) sendSpecs := testhelper.MockSendSpecs() for _, msg := range msgs { meta := sendSpecs[rand.Intn(len(sendSpecs))] - id, err := api.ForcePushMessageWithId(ctx, account, msg.ID, &msg.Message, meta) + id, err := api.PushMessageWithId(ctx, msg.ID, &msg.Message, meta) assert.NoError(t, err) assert.Equal(t, msg.ID, id) } @@ -239,13 +200,13 @@ func waitMessage(ctx context.Context, t *testing.T, api messager.IMessager, msg return res } -func genMessagesAndWait(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) []*types.Message { +func genMessagesAndWait(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) []*types.Message { msgs := genMessageWithAddress(addrs) sendSpecs := testhelper.MockSendSpecs() for _, msg := range msgs { meta := sendSpecs[rand.Intn(len(sendSpecs))] - id, err := api.ForcePushMessageWithId(ctx, account, msg.ID, &msg.Message, meta) + id, err := api.PushMessageWithId(ctx, msg.ID, &msg.Message, meta) assert.NoError(t, err) assert.Equal(t, msg.ID, id) } @@ -258,8 +219,8 @@ func genMessagesAndWait(ctx context.Context, t *testing.T, api messager.IMessage return newMsgs } -func testGetMessageByUnsignedCID(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessagesAndWait(ctx, t, api, addrs, account) +func testGetMessageByUnsignedCID(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { + msgs := genMessagesAndWait(ctx, t, api, addrs) for _, msg := range msgs { res, err := api.GetMessageByUnsignedCid(ctx, *msg.UnsignedCid) assert.NoError(t, err) @@ -273,8 +234,8 @@ func testGetMessageByUnsignedCID(ctx context.Context, t *testing.T, api messager assert.Nil(t, res) } -func testGetMessageBySignedCID(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessagesAndWait(ctx, t, api, addrs, account) +func testGetMessageBySignedCID(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { + msgs := genMessagesAndWait(ctx, t, api, addrs) for _, msg := range msgs { res, err := api.GetMessageBySignedCid(ctx, *msg.SignedCid) assert.NoError(t, err) @@ -288,8 +249,8 @@ func testGetMessageBySignedCID(ctx context.Context, t *testing.T, api messager.I assert.Nil(t, res) } -func testGetMessageByFromAndNonce(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessagesAndWait(ctx, t, api, addrs, account) +func testGetMessageByFromAndNonce(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { + msgs := genMessagesAndWait(ctx, t, api, addrs) for _, msg := range msgs { res, err := api.GetMessageByFromAndNonce(ctx, msg.From, msg.Nonce) assert.NoError(t, err) @@ -303,8 +264,8 @@ func testGetMessageByFromAndNonce(ctx context.Context, t *testing.T, api message assert.Nil(t, res) } -func testListMessage(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { - msgs := genMessagesAndWait(ctx, t, api, addrs, account) +func testListMessage(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { + msgs := genMessagesAndWait(ctx, t, api, addrs) list, err := api.ListMessage(ctx) assert.NoError(t, err) assert.GreaterOrEqual(t, len(list), len(msgs)) @@ -323,10 +284,10 @@ func testListMessage(ctx context.Context, t *testing.T, api messager.IMessager, } } -func testListMessageByFromState(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address, account string) { +func testListMessageByFromState(ctx context.Context, t *testing.T, api messager.IMessager, addrs []address.Address) { // insert message - genMessagesAndWait(ctx, t, api, addrs, account) - genMessagesAndWait(ctx, t, api, addrs, account) + genMessagesAndWait(ctx, t, api, addrs) + genMessagesAndWait(ctx, t, api, addrs) state := types.OnChainMsg isAsc := true diff --git a/service/message_selector_test.go b/service/message_selector_test.go index 912d4e36..4583c9b2 100644 --- a/service/message_selector_test.go +++ b/service/message_selector_test.go @@ -9,9 +9,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/venus/venus-shared/testutil" - shared "github.com/filecoin-project/venus/venus-shared/types" - types "github.com/filecoin-project/venus/venus-shared/types/messager" + "github.com/stretchr/testify/assert" "go.uber.org/fx/fxtest" @@ -22,9 +20,11 @@ import ( "github.com/filecoin-project/venus-messager/models" "github.com/filecoin-project/venus-messager/pubsub" "github.com/filecoin-project/venus-messager/testhelper" -) -const defaultLocalToken = "defaultLocalToken" + "github.com/filecoin-project/venus/venus-shared/testutil" + shared "github.com/filecoin-project/venus/venus-shared/types" + types "github.com/filecoin-project/venus/venus-shared/types/messager" +) func TestMergeMsgSpec(t *testing.T) { defSharedPramsCopy := *DefSharedParams @@ -173,10 +173,9 @@ func TestSelectMessage(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -195,7 +194,7 @@ func TestSelectMessage(t *testing.T) { assert.Error(t, err) totalMsg := len(addrs) * 10 - msgs := genMessages(addrs, account, totalMsg) + msgs := genMessages(addrs, totalMsg) assert.NoError(t, pushMessage(ctx, ms, msgs)) ts, err = msh.fullNode.ChainHead(ctx) @@ -226,10 +225,9 @@ func TestSelectNum(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -239,7 +237,7 @@ func TestSelectNum(t *testing.T) { defSelectedNum := int(DefSharedParams.SelMsgNum) totalMsg := len(addrs) * 50 - msgs := genMessages(addrs, account, totalMsg) + msgs := genMessages(addrs, totalMsg) assert.NoError(t, pushMessage(ctx, ms, msgs)) checkSelectNum := func(msgs []*types.Message, addrNum map[address.Address]int, defNum int) { @@ -306,10 +304,9 @@ func TestEstimateMessageGas(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -317,7 +314,7 @@ func TestEstimateMessageGas(t *testing.T) { assert.NoError(t, lc.Start(ctx)) defer lc.RequireStop() - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs := genMessages(addrs, len(addrs)*10) for _, msg := range msgs { // will estimate gas failed msg.GasLimit = -1 @@ -364,7 +361,7 @@ func TestEstimateMessageGas(t *testing.T) { assert.NoError(t, ms.addressService.SetFeeParams(ctx, params)) } - msgs = genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs = genMessages(addrs, len(addrs)*10) for _, msg := range msgs { // use the fee params in the address table msg.Meta = nil @@ -397,10 +394,9 @@ func TestBaseFee(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -409,7 +405,7 @@ func TestBaseFee(t *testing.T) { defer lc.RequireStop() totalMsg := len(addrs) * int(DefSharedParams.SelMsgNum) - msgs := genMessages(addrs, account, totalMsg) + msgs := genMessages(addrs, totalMsg) assert.NoError(t, pushMessage(ctx, ms, msgs)) // global basefee too low @@ -507,10 +503,9 @@ func TestSignMessageFailed(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -518,12 +513,12 @@ func TestSignMessageFailed(t *testing.T) { assert.NoError(t, lc.Start(ctx)) defer lc.RequireStop() - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs := genMessages(addrs, len(addrs)*10) assert.NoError(t, pushMessage(ctx, ms, msgs)) removedAddrs := addrs[:len(addrs)/2] aliveAddrs := addrs[len(addrs)/2:] - assert.NoError(t, msh.walletProxy.RemoveAddress(defaultLocalToken, removedAddrs)) + assert.NoError(t, msh.walletProxy.RemoveAddress(ctx, removedAddrs)) ts, err := msh.fullNode.ChainHead(ctx) assert.NoError(t, err) @@ -749,12 +744,10 @@ func checkGasFee(t *testing.T, srcMsgs, currMsgs *types.Message, sharedParams *t assert.Equal(t, gasPremium, currMsgs.GasPremium) } -func genMessages(addrs []address.Address, account string, count int) []*types.Message { +func genMessages(addrs []address.Address, count int) []*types.Message { msgs := testhelper.NewMessages(count) sendSpecs := testhelper.MockSendSpecs() for i, msg := range msgs { - msg.FromUser = account - msg.WalletName = account msg.From = addrs[i%len(addrs)] msg.Meta = sendSpecs[i%len(sendSpecs)] } diff --git a/service/message_service.go b/service/message_service.go index 9c82edd1..af81f40f 100644 --- a/service/message_service.go +++ b/service/message_service.go @@ -202,7 +202,6 @@ func (ms *MessageService) pushMessage(ctx context.Context, msg *types.Message) e return ms.repo.MessageRepo().CreateMessage(msg) } -<<<<<<< HEAD func (ms *MessageService) PushMessage(ctx context.Context, msg *venusTypes.Message, meta *types.SendSpec) (string, error) { return ms.PushMessageWithId(ctx, venusTypes.NewUUID().String(), msg, meta) } @@ -1091,47 +1090,47 @@ func (ms *MessageService) recordMetricsProc(ctx context.Context) { } for _, addr := range addrs { - tCtx, _ := tag.New( + ctx, _ = tag.New( ctx, tag.Upsert(metrics.WalletAddress, addr.Addr.String()), ) - stats.Record(tCtx, metrics.WalletDBNonce.M(int64(addr.Nonce))) + stats.Record(ctx, metrics.WalletDBNonce.M(int64(addr.Nonce))) - actor, err := ms.nodeClient.StateGetActor(tCtx, addr.Addr, venusTypes.EmptyTSK) + actor, err := ms.nodeClient.StateGetActor(ctx, addr.Addr, venusTypes.EmptyTSK) if err != nil { ms.addressService.log.Errorf("get actor err: %s", err) } else { balance, _ := strconv.ParseFloat(venusTypes.FIL(actor.Balance).Unitless(), 64) - stats.Record(tCtx, metrics.WalletBalance.M(balance)) - stats.Record(tCtx, metrics.WalletChainNonce.M(int64(actor.Nonce))) + stats.Record(ctx, metrics.WalletBalance.M(balance)) + stats.Record(ctx, metrics.WalletChainNonce.M(int64(actor.Nonce))) } msgs, err := ms.repo.MessageRepo().ListUnFilledMessage(addr.Addr) if err != nil { ms.addressService.log.Errorf("get unFilled msg err: %s", err) } else { - stats.Record(tCtx, metrics.NumOfUnFillMsg.M(int64(len(msgs)))) + stats.Record(ctx, metrics.NumOfUnFillMsg.M(int64(len(msgs)))) } msgs, err = ms.repo.MessageRepo().ListFilledMessageByAddress(addr.Addr) if err != nil { ms.addressService.log.Errorf("get filled msg err: %s", err) } else { - stats.Record(tCtx, metrics.NumOfFillMsg.M(int64(len(msgs)))) + stats.Record(ctx, metrics.NumOfFillMsg.M(int64(len(msgs)))) } msgs, err = ms.repo.MessageRepo().ListBlockedMessage(addr.Addr, 3*time.Minute) if err != nil { ms.addressService.log.Errorf("get blocked three minutes msg err: %s", err) } else { - stats.Record(tCtx, metrics.NumOfMsgBlockedThreeMinutes.M(int64(len(msgs)))) + stats.Record(ctx, metrics.NumOfMsgBlockedThreeMinutes.M(int64(len(msgs)))) } msgs, err = ms.repo.MessageRepo().ListBlockedMessage(addr.Addr, 5*time.Minute) if err != nil { ms.addressService.log.Errorf("get blocked five minutes msg err: %s", err) } else { - stats.Record(tCtx, metrics.NumOfMsgBlockedFiveMinutes.M(int64(len(msgs)))) + stats.Record(ctx, metrics.NumOfMsgBlockedFiveMinutes.M(int64(len(msgs)))) } } diff --git a/service/message_service_test.go b/service/message_service_test.go index ae124dec..b41506a2 100644 --- a/service/message_service_test.go +++ b/service/message_service_test.go @@ -11,16 +11,18 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/venus/pkg/constants" - "github.com/filecoin-project/venus/venus-shared/testutil" - shared "github.com/filecoin-project/venus/venus-shared/types" - types "github.com/filecoin-project/venus/venus-shared/types/messager" + "github.com/stretchr/testify/assert" "go.uber.org/fx/fxtest" "github.com/filecoin-project/venus-messager/config" "github.com/filecoin-project/venus-messager/filestore" "github.com/filecoin-project/venus-messager/testhelper" + + "github.com/filecoin-project/venus/pkg/constants" + "github.com/filecoin-project/venus/venus-shared/testutil" + shared "github.com/filecoin-project/venus/venus-shared/types" + types "github.com/filecoin-project/venus/venus-shared/types/messager" ) func TestVerifyNetworkName(t *testing.T) { @@ -67,10 +69,9 @@ func TestReplaceMessage(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -79,7 +80,7 @@ func TestReplaceMessage(t *testing.T) { defer lc.RequireStop() blockedMsgs := make(map[string]*types.Message, 0) - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs := genMessages(addrs, len(addrs)*10) for i, msg := range msgs { if i%2 == 0 { msg.GasPremium = big.Sub(testhelper.MinPackedPremium, big.NewInt(100)) @@ -426,10 +427,9 @@ func TestMessageService_PushMessage(t *testing.T) { msh, err := newMessageServiceHelper(ctx, cfg, blockDelay, fsRepo) assert.NoError(t, err) - account := defaultLocalToken addr := testutil.BlsAddressProvider()(t) assert.NoError(t, msh.fullNode.AddActors([]address.Address{addr})) - assert.NoError(t, msh.walletProxy.AddAddress(account, []address.Address{addr})) + assert.NoError(t, msh.walletProxy.AddAddress([]address.Address{addr})) lc := fxtest.NewLifecycle(t) _ = StartNodeEvents(lc, msh.fullNode, msh.ms, msh.ms.log) @@ -445,7 +445,7 @@ func TestMessageService_PushMessage(t *testing.T) { //stm: @MESSENGER_SERVICE_LIST_MESSAGE_001 rawMsg := testhelper.NewUnsignedMessage() rawMsg.From = addr - uidStr, err := msh.ms.PushMessage(ctx, account, &rawMsg, nil) + uidStr, err := msh.ms.PushMessage(ctx, &rawMsg, nil) assert.NoError(t, err) _, err = shared.ParseUUID(uidStr) assert.NoError(t, err) @@ -453,7 +453,7 @@ func TestMessageService_PushMessage(t *testing.T) { { // pushing message would be failed pushFailedMsg := testhelper.NewUnsignedMessage() - _, err = msh.ms.PushMessage(ctx, "invalid account", &pushFailedMsg, nil) + _, err = msh.ms.PushMessage(ctx, &pushFailedMsg, nil) assert.Error(t, err) // msg with uuid not exists, expect an error _, err = msh.ms.GetMessageByUid(ctx, shared.NewUUID().String()) diff --git a/service/message_state_refresh_test.go b/service/message_state_refresh_test.go index 12b5c5cf..6bb275f6 100644 --- a/service/message_state_refresh_test.go +++ b/service/message_state_refresh_test.go @@ -8,9 +8,6 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/venus/pkg/constants" - shared "github.com/filecoin-project/venus/venus-shared/types" - types "github.com/filecoin-project/venus/venus-shared/types/messager" "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" "go.uber.org/fx/fxtest" @@ -18,6 +15,10 @@ import ( "github.com/filecoin-project/venus-messager/config" "github.com/filecoin-project/venus-messager/filestore" "github.com/filecoin-project/venus-messager/testhelper" + + "github.com/filecoin-project/venus/pkg/constants" + shared "github.com/filecoin-project/venus/venus-shared/types" + types "github.com/filecoin-project/venus/venus-shared/types/messager" ) func TestDoRefreshMessageState(t *testing.T) { @@ -31,10 +32,9 @@ func TestDoRefreshMessageState(t *testing.T) { msh, err := newMessageServiceHelper(ctx, cfg, blockDelay, fsRepo) assert.NoError(t, err) - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -48,7 +48,7 @@ func TestDoRefreshMessageState(t *testing.T) { wg := sync.WaitGroup{} for i := 0; i < 10; i++ { wg.Add(1) - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs := genMessages(addrs, len(addrs)*10) assert.NoError(t, pushMessage(ctx, msh.ms, msgs)) go func(msgs []*types.Message) { defer wg.Done() @@ -77,7 +77,7 @@ func TestDoRefreshMessageState(t *testing.T) { for i < loop { select { case <-ticker.C: - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*2*(i+1)) + msgs := genMessages(addrs, len(addrs)*2*(i+1)) assert.NoError(t, pushMessage(ctx, msh.ms, msgs)) if i == 6 { msh.fullNode.SendRevertSignal(rs) @@ -129,10 +129,9 @@ func TestDoRefreshMessageState(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -140,7 +139,7 @@ func TestDoRefreshMessageState(t *testing.T) { assert.NoError(t, lc.Start(ctx)) defer lc.RequireStop() - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10) + msgs := genMessages(addrs, len(addrs)*10) assert.NoError(t, pushMessage(ctx, ms, msgs)) ts, err := msh.fullNode.ChainHead(ctx) @@ -230,10 +229,9 @@ func TestDoRefreshMessageState(t *testing.T) { assert.NoError(t, err) ms := msh.ms - account := defaultLocalToken addrCount := 1 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(account, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -244,7 +242,7 @@ func TestDoRefreshMessageState(t *testing.T) { // first message will estimate gas failed // second message will on chain // both messages nonce is 0 - msgs := genMessages(addrs, defaultLocalToken, 2) + msgs := genMessages(addrs, 2) msg := msgs[0] msg.GasLimit = -1 assert.NoError(t, pushMessage(ctx, ms, msgs)) @@ -289,7 +287,7 @@ func TestUpdateMessageState(t *testing.T) { addrCount := 10 addrs := testhelper.ResolveAddrs(t, testhelper.RandAddresses(t, addrCount)) - assert.NoError(t, msh.walletProxy.AddAddress(defaultLocalToken, addrs)) + assert.NoError(t, msh.walletProxy.AddAddress(addrs)) assert.NoError(t, msh.fullNode.AddActors(addrs)) lc := fxtest.NewLifecycle(t) @@ -297,7 +295,7 @@ func TestUpdateMessageState(t *testing.T) { assert.NoError(t, lc.Start(ctx)) defer lc.RequireStop() - msgs := genMessages(addrs, defaultLocalToken, len(addrs)*10*5) + msgs := genMessages(addrs, len(addrs)*10*5) assert.NoError(t, pushMessage(ctx, msh.ms, msgs)) ts, err := msh.fullNode.ChainHead(ctx)