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

Fix tests

Browse Source
This commit is contained in:
ZenGround0 2021-08-12 14:01:24 -04:00
parent 73a644f320
commit c8720fef02
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itests/kit/client.go
View File

@ -26,7 +26,7 @@ func RunClientTest(t *testing.T, cmds []*lcli.Command, clientNode *TestFullNode)
defer cancel() defer cancel()
// Create mock CLI // Create mock CLI
mockCLI := NewMockCLI(ctx, t, cmds) mockCLI := NewMockCLI(ctx, t, cmds, api.NodeFull)
clientCLI := mockCLI.Client(clientNode.ListenAddr) clientCLI := mockCLI.Client(clientNode.ListenAddr)
// Get the Miner address // Get the Miner address

5
itests/kit/mockcli.go
View File

@ -7,6 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/filecoin-project/lotus/api"
"github.com/multiformats/go-multiaddr" "github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
lcli "github.com/urfave/cli/v2" lcli "github.com/urfave/cli/v2"
@ -19,7 +20,7 @@ type MockCLI struct {
out *bytes.Buffer out *bytes.Buffer
} }
func NewMockCLI(ctx context.Context, t *testing.T, cmds []*lcli.Command) *MockCLI { func NewMockCLI(ctx context.Context, t *testing.T, cmds []*lcli.Command, nodeType api.NodeType) *MockCLI {
// Create a CLI App with an --api-url flag so that we can specify which node // Create a CLI App with an --api-url flag so that we can specify which node
// the command should be executed against // the command should be executed against
app := &lcli.App{ app := &lcli.App{
@ -31,6 +32,8 @@ func NewMockCLI(ctx context.Context, t *testing.T, cmds []*lcli.Command) *MockCL
}, },
Commands: cmds, Commands: cmds,
} }
// Set node type
api.RunningNodeType = nodeType
var out bytes.Buffer var out bytes.Buffer
app.Writer = &out app.Writer = &out

3
itests/multisig/suite.go
View File

@ -8,6 +8,7 @@ import (
"testing" "testing"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/itests/kit"
@ -19,6 +20,8 @@ func RunMultisigTests(t *testing.T, client *kit.TestFullNode) {
ctx := context.Background() ctx := context.Background()
mockCLI := kit.NewMockCLI(ctx, t, cli.Commands) mockCLI := kit.NewMockCLI(ctx, t, cli.Commands)
clientCLI := mockCLI.Client(client.ListenAddr) clientCLI := mockCLI.Client(client.ListenAddr)
// msig tests run against a full node
api.RunningNodeType = api.NodeFull
// Create some wallets on the node to use for testing multisig // Create some wallets on the node to use for testing multisig
var walletAddrs []address.Address var walletAddrs []address.Address

9
itests/paych_cli_test.go
View File

@ -10,6 +10,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/itests/kit"
@ -42,7 +43,7 @@ func TestPaymentChannelsBasic(t *testing.T) {
creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime) creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime)
// Create mock CLI // Create mock CLI
mockCLI := kit.NewMockCLI(ctx, t, cli.Commands) mockCLI := kit.NewMockCLI(ctx, t, cli.Commands, api.NodeFull)
creatorCLI := mockCLI.Client(paymentCreator.ListenAddr) creatorCLI := mockCLI.Client(paymentCreator.ListenAddr)
receiverCLI := mockCLI.Client(paymentReceiver.ListenAddr) receiverCLI := mockCLI.Client(paymentReceiver.ListenAddr)
@ -98,7 +99,7 @@ func TestPaymentChannelStatus(t *testing.T) {
creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime) creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime)
// Create mock CLI // Create mock CLI
mockCLI := kit.NewMockCLI(ctx, t, cli.Commands) mockCLI := kit.NewMockCLI(ctx, t, cli.Commands, api.NodeFull)
creatorCLI := mockCLI.Client(paymentCreator.ListenAddr) creatorCLI := mockCLI.Client(paymentCreator.ListenAddr)
// creator: paych status-by-from-to <creator> <receiver> // creator: paych status-by-from-to <creator> <receiver>
@ -178,7 +179,7 @@ func TestPaymentChannelVouchers(t *testing.T) {
creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime) creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime)
// Create mock CLI // Create mock CLI
mockCLI := kit.NewMockCLI(ctx, t, cli.Commands) mockCLI := kit.NewMockCLI(ctx, t, cli.Commands, api.NodeFull)
creatorCLI := mockCLI.Client(paymentCreator.ListenAddr) creatorCLI := mockCLI.Client(paymentCreator.ListenAddr)
receiverCLI := mockCLI.Client(paymentReceiver.ListenAddr) receiverCLI := mockCLI.Client(paymentReceiver.ListenAddr)
@ -310,7 +311,7 @@ func TestPaymentChannelVoucherCreateShortfall(t *testing.T) {
creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime) creatorAddr, receiverAddr := startPaychCreatorReceiverMiner(ctx, t, &paymentCreator, &paymentReceiver, blocktime)
// Create mock CLI // Create mock CLI
mockCLI := kit.NewMockCLI(ctx, t, cli.Commands) mockCLI := kit.NewMockCLI(ctx, t, cli.Commands, api.NodeFull)
creatorCLI := mockCLI.Client(paymentCreator.ListenAddr) creatorCLI := mockCLI.Client(paymentCreator.ListenAddr)
// creator: paych add-funds <creator> <receiver> <amount> // creator: paych add-funds <creator> <receiver> <amount>