Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Testing] Unit tests, E2E tests, logging and other Fixes / "Touchups" #253

Merged
merged 21 commits into from
Dec 13, 2023
Merged

[Testing] Unit tests, E2E tests, logging and other Fixes / "Touchups" #253

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
913344a
Quick fixes for E2E tests
Olshansk Dec 10, 2023
2fcc881
Adding some comment out code
Olshansk Dec 10, 2023
27d9c3a
Clean up some unit tests per #220
Olshansk Dec 10, 2023
90d75bd
Fixed logs under x/
Olshansk Dec 10, 2023
9181c56
Reverted the hosts in localnet so a new cluster can spin up again
Olshansk Dec 10, 2023
d1659d6
E2E tests work
Olshansk Dec 10, 2023
da65f82
A few more minor comments
Olshansk Dec 10, 2023
ddbd4d0
Empty commit
Olshansk Dec 10, 2023
d2fe64e
Fix unit tests and verify e2e tests again
Olshansk Dec 11, 2023
8b235bc
[CI/E2E] e2e fixes for e2e fixes (#258)
okdas Dec 12, 2023
b985910
Update pull_request_template.md (#254)
Olshansk Dec 10, 2023
2c03b25
[Logging] Enforce polylog usage after #219 for new logs added (#244)
Olshansk Dec 11, 2023
c5bc8e7
Ran make go_imports
Olshansk Dec 12, 2023
8d0ec2f
Merge with main
Olshansk Dec 12, 2023
d62858b
Update pkg/client/supplier/client.go
Olshansk Dec 12, 2023
ebc0d6e
Update pkg/client/delegation/client.go
Olshansk Dec 12, 2023
254568d
Moved in-line strings to a local constant in tests
Olshansk Dec 12, 2023
08236ac
Tend to a few more PR comments
Olshansk Dec 12, 2023
69f9a9e
Consolidated ports 8548 and 8545
Olshansk Dec 12, 2023
9228887
Manually run the following command on the files provided: goimports-r…
Olshansk Dec 12, 2023
1a84277
Merge branch 'main' into e2e_quick_fixes
Olshansk Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if localnet_config["helm_chart_local_repo"]["enabled"]:
print("Using local helm chart repo " + helm_chart_local_repo)
chart_prefix = helm_chart_local_repo + "/charts/"


# Import files into Kubernetes ConfigMap
def read_files_from_directory(directory):
files = listdir(directory)
Expand Down
1 change: 1 addition & 0 deletions e2e/tests/relay.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Relay Namespace

# TODO_TECHDEBT(@Olshansk, #180): This test requires you to run `make supplier1_stake && make app1_stake` first
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the purposes of the E2E test, we also have the option to shortcut #180 by modifying existing step definitions (e.g. #TheApplicationIsStakedForService), or adding new step(s) (i.e. "given ..."), which do this staking against local/dev-net

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating the comment but want to keep the actual change outside the scope of this PR.

Scenario: App can send relay to Supplier
Given the user has the pocketd binary installed
And the application "app1" is staked for service "anvil"
Expand Down
21 changes: 12 additions & 9 deletions e2e/tests/session_steps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@ import (
"time"

abci "github.com/cometbft/cometbft/abci/types"
"github.com/stretchr/testify/require"

"github.com/pokt-network/poktroll/pkg/client/events"
"github.com/pokt-network/poktroll/pkg/either"
"github.com/pokt-network/poktroll/pkg/observable"
"github.com/pokt-network/poktroll/pkg/observable/channel"
"github.com/pokt-network/poktroll/testutil/testclient"
suppliertypes "github.com/pokt-network/poktroll/x/supplier/types"
"github.com/stretchr/testify/require"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

const (
createClaimTimeoutDuration = 10 * time.Second
eitherEventsReplayBufferSize = 100
msgClaimSenderQueryFmt = "tm.event='Tx' AND message.sender='%s'"
msgClaimSenderQueryFmt = "tm.event='Tx' AND message.sender='%s' AND message.action='/pocket.supplier.MsgCreateClaim'"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
testServiceId = "anvil"
eitherEventsBzReplayObsKey = "eitherEventsBzReplayObsKey"
preExistingClaimsKey = "preExistingClaimsKey"
Expand Down Expand Up @@ -86,17 +85,21 @@ func (s *suite) AfterTheSupplierCreatesAClaimForTheSessionForServiceForApplicati
func (s *suite) TheClaimCreatedBySupplierForServiceForApplicationShouldBePersistedOnchain(supplierName, serviceId, appName string) {
ctx := context.Background()

claimsRes, err := s.supplierQueryClient.AllClaims(ctx, &suppliertypes.QueryAllClaimsRequest{
allClaimsRes, err := s.supplierQueryClient.AllClaims(ctx, &suppliertypes.QueryAllClaimsRequest{
Filter: &suppliertypes.QueryAllClaimsRequest_SupplierAddress{
SupplierAddress: accNameToAddrMap[supplierName],
},
})
require.NoError(s, err)
require.NotNil(s, claimsRes)
require.NotNil(s, allClaimsRes)

// Assert that the number of claims has increased by one.
preExistingClaims := s.scenarioState[preExistingClaimsKey].([]suppliertypes.Claim)
require.Len(s, claimsRes.Claim, len(preExistingClaims)+1)
// NB: We are avoiding the use of require.Len here because it provides unreadable output
// TODO_TECHDEBT: Due to the speed of the blocks of the LocalNet sequencer, along with the small number
// of blocks per session, multiple claims may be created throughout the duration of the test. Until
// these values are appropriately adjusted
require.Greater(s, len(allClaimsRes.Claim), len(preExistingClaims), "number of claims must have increased")
Comment on lines +98 to +102
Copy link
Contributor

@bryanchriswhite bryanchriswhite Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think require.Greater() works better here in general and the part of the comment explaining this assertion is 👌. 💯

I'm less convinced that the part of the comment against usage of require.Len() is warranted, did you experiment with require.Lenf()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think require.Greater() works better here in general and the part of the comment explaining this assertion is 👌. 💯

👍

I'm less convinced that the part of the comment against usage of require.Len() is warranted, did you experiment with require.Lenf()?

I did experiment with Lenf, but I did experiment with giving require.Len an unformatted string.

When there's an error, it prints out the entire claims slice. This was an array of serialized protos and large in length, which looked incomprehensible on the screen and confusing to the reader.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did experiment with Lenf, but I did experiment with giving require.Len an unformatted string.

I'm assuming one of those is suppose to be a "didn't". 😅

For the record, in other cases, I would argue that #Lenf() produces the least ambiguous output. I agree that the output can be large if the list is not empty; however, that information is useful when debugging, and isn't obscuring the reason for failure as it's on its own line.

#Lenf()

func TestSanity(t *testing.T) {
	x := []struct{ a, b int }{{1, 2}, {3, 4}}
	require.Lenf(t, x, 3, "x should have 3 elements, got %d", len(x))
}

image

#Len()

func TestSanity(t *testing.T) {
	x := []struct{ a, b int }{{1, 2}, {3, 4}}
	require.Len(t, x, 3)
}

image

#Greater()

func TestSanity(t *testing.T) {
	x := []struct{ a, b int }{{1, 2}, {3, 4}}
	require.Greater(t, len(x), 2)
}

image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, I am not against the use of Len or Lenf. However, this is what the output looks like when we are use large serialized objects. Identifying the should have X items was a struggle at first, and even more difficult when dealing with 50+ items in the list.

Screenshot 2023-12-13 at 12 50 01 PM


// TODO_IMPROVE: assert that the root hash of the claim contains the correct
// SMST sum. The sum can be retrieved by parsing the last 8 bytes as a
Expand All @@ -106,7 +109,7 @@ func (s *suite) TheClaimCreatedBySupplierForServiceForApplicationShouldBePersist
// TODO_IMPROVE: add assertions about serviceId and appName and/or incorporate
// them into the scenarioState key(s).

claim := claimsRes.Claim[0]
claim := allClaimsRes.Claim[0]
require.Equal(s, accNameToAddrMap[supplierName], claim.SupplierAddress)
}

Expand All @@ -118,9 +121,9 @@ func (s *suite) TheSupplierHasServicedASessionWithRelaysForServiceForApplication

// Query for any existing claims so that we can compensate for them in the
// future assertions about changes in on-chain claims.
claimsRes, err := s.supplierQueryClient.AllClaims(ctx, &suppliertypes.QueryAllClaimsRequest{})
allClaimsRes, err := s.supplierQueryClient.AllClaims(ctx, &suppliertypes.QueryAllClaimsRequest{})
require.NoError(s, err)
s.scenarioState[preExistingClaimsKey] = claimsRes.Claim
s.scenarioState[preExistingClaimsKey] = allClaimsRes.Claim

// Construct an events query client to listen for tx events from the supplier.
msgSenderQuery := fmt.Sprintf(msgClaimSenderQueryFmt, accNameToAddrMap[supplierName])
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require (
github.com/athanorlabs/go-dleq v0.1.0
github.com/cometbft/cometbft v0.37.2
github.com/cometbft/cometbft-db v0.8.0
github.com/cosmos/cosmos-proto v1.0.0-beta.2
github.com/cosmos/cosmos-sdk v0.47.3
github.com/cosmos/gogoproto v1.4.11
github.com/cosmos/ibc-go/v7 v7.1.0
Expand All @@ -45,6 +46,7 @@ require (
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.15.0
golang.org/x/sync v0.5.0
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb
google.golang.org/grpc v1.59.0
gopkg.in/yaml.v2 v2.4.0
)
Expand Down Expand Up @@ -88,7 +90,6 @@ require (
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v0.20.0 // indirect
Expand Down Expand Up @@ -284,7 +285,6 @@ require (
google.golang.org/api v0.143.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
1 change: 0 additions & 1 deletion localnet/kubernetes/values-relayminer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
config:
query_node_url: tcp://sequencer-poktroll-sequencer:36657
network_node_url: tcp://sequencer-poktroll-sequencer:36657

Olshansk marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 5 additions & 4 deletions pkg/client/block/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"encoding/json"

"github.com/cometbft/cometbft/types"

"github.com/pokt-network/poktroll/pkg/client"
"github.com/pokt-network/poktroll/pkg/client/events"
)
Expand All @@ -27,9 +26,9 @@ func (blockEvent *cometBlockEvent) Hash() []byte {
return blockEvent.Block.LastBlockID.Hash.Bytes()
}

// newCometBlockEventFactoryFn is a factory function that returns a functon
// newCometBlockEventFactoryFn is a factory function that returns a function
// that attempts to deserialize the given bytes into a comet block.
// if the resulting block has a height of zero, assume the event was not a block
// If the resulting block has a height of zero, assume the event was not a block
// event and return an ErrUnmarshalBlockEvent error.
func newCometBlockEventFactoryFn() events.NewEventsFn[client.Block] {
return func(blockMsgBz []byte) (client.Block, error) {
Expand All @@ -38,7 +37,9 @@ func newCometBlockEventFactoryFn() events.NewEventsFn[client.Block] {
return nil, err
}

// If msg does not match the expected format then the block's height has a zero value.
// The header height should never be zero. If it is, it means that blockMsg
// does not match the expected format which led unmarshaling to fail,
// and blockHeader.height to have a default value.
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
if blockMsg.Block.Header.Height == 0 {
return nil, events.ErrEventsUnmarshalEvent.
Wrapf("with block data: %s", string(blockMsgBz))
Expand Down
7 changes: 3 additions & 4 deletions pkg/client/block/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"

"cosmossdk.io/depinject"

"github.com/pokt-network/poktroll/pkg/client"
"github.com/pokt-network/poktroll/pkg/client/events"
)
Expand All @@ -15,11 +14,11 @@ const (
// the chain.
// See: https://docs.cosmos.network/v0.47/learn/advanced/events#default-events
committedBlocksQuery = "tm.event='NewBlock'"
// TODO_TECHDEBT/TODO_FUTURE: add a `blocksReplayLimit` field to the block
// client struct that defaults to this but can be overridden via an option
// in future work.

// defaultBlocksReplayLimit is the number of blocks that the replay
// observable returned by LastNBlocks() will be able to replay.
// TODO_TECHDEBT/TODO_FUTURE: add a `blocksReplayLimit` field to the blockClient
// struct that defaults to this but can be overridden via an option.
defaultBlocksReplayLimit = 100
)

Expand Down
7 changes: 3 additions & 4 deletions pkg/client/delegation/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"

"cosmossdk.io/depinject"

"github.com/pokt-network/poktroll/pkg/client"
"github.com/pokt-network/poktroll/pkg/client/events"
)
Expand All @@ -15,11 +14,11 @@ const (
// See: https://docs.cosmos.network/v0.47/learn/advanced/events#subscribing-to-events
// And: https://docs.cosmos.network/v0.47/learn/advanced/events#default-events
delegationEventQuery = "message.action='pocket.application.EventRedelegation'"
// TODO_TECHDEBT/TODO_FUTURE: add a `blocksReplayLimit` field to the block
// client struct that defaults to this but can be overridden via an option
// in future work.

// defaultRedelegationsReplayLimit is the number of redelegations that the
// replay observable returned by LastNRedelegations() will be able to replay.
// TODO_TECHDEBT/TODO_FUTURE: add a `blocksReplayLimit` field to the blockClient
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
// struct that defaults to this but can be overridden via an option.
defaultRedelegationsReplayLimit = 100
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/client/events/replay_client_example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"

"cosmossdk.io/depinject"

Olshansk marked this conversation as resolved.
Show resolved Hide resolved
"github.com/pokt-network/poktroll/pkg/client/events"
"github.com/pokt-network/poktroll/pkg/observable"
"github.com/pokt-network/poktroll/pkg/polylog"
Expand All @@ -23,6 +22,8 @@ const (
replayObsBufferSize = 1
)

var _ EventType = (*eventType)(nil)
Olshansk marked this conversation as resolved.
Show resolved Hide resolved

// Define an interface to represent the onchain event
type EventType interface {
GetName() string // Illustrative only; arbitrary interfaces are supported.
Expand Down
5 changes: 2 additions & 3 deletions pkg/client/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ import (
cosmoskeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
cosmostypes "github.com/cosmos/cosmos-sdk/types"
accounttypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/pokt-network/smt"

"github.com/pokt-network/poktroll/pkg/either"
"github.com/pokt-network/poktroll/pkg/observable"
apptypes "github.com/pokt-network/poktroll/x/application/types"
sessiontypes "github.com/pokt-network/poktroll/x/session/types"
sharedtypes "github.com/pokt-network/poktroll/x/shared/types"
"github.com/pokt-network/smt"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

// SupplierClient is an interface for sufficient for a supplier operator to be
Expand Down Expand Up @@ -111,7 +110,7 @@ type Block interface {

// Redelegation is an interface which wraps the EventRedelegation event
// emitted by the application module.
// See: proto/pocket/application/types/event.proto#EventRedelegatio
// See: proto/pocket/application/types/event.proto#EventRedelegation
type Redelegation interface {
GetAppAddress() string
GetGatewayAddress() string
Expand Down
27 changes: 23 additions & 4 deletions pkg/client/supplier/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (

"cosmossdk.io/depinject"
cosmostypes "github.com/cosmos/cosmos-sdk/types"
"github.com/pokt-network/smt"

"github.com/pokt-network/poktroll/pkg/client"
"github.com/pokt-network/poktroll/pkg/client/keyring"
"github.com/pokt-network/poktroll/pkg/polylog"
sessiontypes "github.com/pokt-network/poktroll/x/session/types"
suppliertypes "github.com/pokt-network/poktroll/x/supplier/types"
"github.com/pokt-network/smt"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

var _ client.SupplierClient = (*supplierClient)(nil)
Expand Down Expand Up @@ -66,6 +66,8 @@ func (sClient *supplierClient) SubmitProof(
sessionHeader sessiontypes.SessionHeader,
proof *smt.SparseMerkleClosestProof,
) error {
logger := polylog.Ctx(ctx)
Olshansk marked this conversation as resolved.
Show resolved Hide resolved

proofBz, err := proof.Marshal()
if err != nil {
return err
Expand All @@ -82,6 +84,14 @@ func (sClient *supplierClient) SubmitProof(
return err
}

// TODO_IMPROVE: log details related to what & how much is being proven
logger.Info().
Str("supplier_addr", sClient.signingKeyAddr.String()).
Str("app_addr", sessionHeader.ApplicationAddress).
Str("session_id", sessionHeader.SessionId).
Str("service", sessionHeader.Service.Id).
Msg("created a new proof")
Olshansk marked this conversation as resolved.
Show resolved Hide resolved

return <-errCh
}

Expand All @@ -93,6 +103,8 @@ func (sClient *supplierClient) CreateClaim(
sessionHeader sessiontypes.SessionHeader,
rootHash []byte,
) error {
logger := polylog.Ctx(ctx)
Olshansk marked this conversation as resolved.
Show resolved Hide resolved

msg := &suppliertypes.MsgCreateClaim{
SupplierAddress: sClient.signingKeyAddr.String(),
SessionHeader: &sessionHeader,
Expand All @@ -104,8 +116,15 @@ func (sClient *supplierClient) CreateClaim(
return err
}

err = <-errCh
return err
// TODO_IMPROVE: log details related to how much is claimed
logger.Info().
Str("supplier_addr", sClient.signingKeyAddr.String()).
Str("app_addr", sessionHeader.ApplicationAddress).
Str("session_id", sessionHeader.SessionId).
Str("service", sessionHeader.Service.Id).
Msg("created a new claim")

return <-errCh
}

// validateConfigAndSetDefaults attempts to get the address from the keyring
Expand Down
24 changes: 15 additions & 9 deletions pkg/client/supplier/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import (

"cosmossdk.io/depinject"
"github.com/golang/mock/gomock"
"github.com/pokt-network/smt"
"github.com/stretchr/testify/require"

"github.com/pokt-network/poktroll/testutil/mockclient"

"github.com/pokt-network/poktroll/pkg/client/keyring"
"github.com/pokt-network/poktroll/pkg/client/supplier"
"github.com/pokt-network/poktroll/pkg/polylog/polyzero"
"github.com/pokt-network/poktroll/testutil/mockclient"
"github.com/pokt-network/poktroll/testutil/testclient/testkeyring"
"github.com/pokt-network/poktroll/testutil/testclient/testtx"
sessiontypes "github.com/pokt-network/poktroll/x/session/types"
sharedtypes "github.com/pokt-network/poktroll/x/shared/types"
"github.com/pokt-network/smt"
"github.com/stretchr/testify/require"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

var testSigningKeyName = "test_signer"
Expand Down Expand Up @@ -76,7 +76,7 @@ func TestSupplierClient_CreateClaim(t *testing.T) {
var (
signAndBroadcastDelay = 50 * time.Millisecond
doneCh = make(chan struct{}, 1)
ctx = context.Background()
ctx = polyzero.NewLogger().WithContext(context.Background())
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

keyring, testAppKey := testkeyring.NewTestKeyringWithKey(t, testSigningKeyName)
Expand All @@ -85,7 +85,7 @@ func TestSupplierClient_CreateClaim(t *testing.T) {
require.NoError(t, err)

txCtxMock, _ := testtx.NewAnyTimesTxTxContext(t, keyring)
txClientMock := testtx.NewOneTimeDelayedSignAndBroadcastTxClient(t, signAndBroadcastDelay)
txClientMock := testtx.NewOneTimeDelayedSignAndBroadcastTxClient(t, ctx, signAndBroadcastDelay)

signingKeyOpt := supplier.WithSigningKeyName(testAppKey.Name)
deps := depinject.Supply(
Expand All @@ -102,6 +102,9 @@ func TestSupplierClient_CreateClaim(t *testing.T) {
ApplicationAddress: testAppAddr.String(),
SessionStartBlockHeight: 0,
SessionId: "",
Service: &sharedtypes.Service{
Id: "test_service",
},
}

go func() {
Expand Down Expand Up @@ -132,7 +135,7 @@ func TestSupplierClient_SubmitProof(t *testing.T) {
var (
signAndBroadcastDelay = 50 * time.Millisecond
doneCh = make(chan struct{}, 1)
ctx = context.Background()
ctx = polyzero.NewLogger().WithContext(context.Background())
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

keyring, testAppKey := testkeyring.NewTestKeyringWithKey(t, testSigningKeyName)
Expand All @@ -141,7 +144,7 @@ func TestSupplierClient_SubmitProof(t *testing.T) {
require.NoError(t, err)

txCtxMock, _ := testtx.NewAnyTimesTxTxContext(t, keyring)
txClientMock := testtx.NewOneTimeDelayedSignAndBroadcastTxClient(t, signAndBroadcastDelay)
txClientMock := testtx.NewOneTimeDelayedSignAndBroadcastTxClient(t, ctx, signAndBroadcastDelay)

signingKeyOpt := supplier.WithSigningKeyName(testAppKey.Name)
deps := depinject.Supply(
Expand All @@ -157,6 +160,9 @@ func TestSupplierClient_SubmitProof(t *testing.T) {
ApplicationAddress: testAppAddr.String(),
SessionStartBlockHeight: 0,
SessionId: "",
Service: &sharedtypes.Service{
Id: "test_service",
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
},
}

kvStore, err := smt.NewKVStore("")
Expand Down
3 changes: 1 addition & 2 deletions pkg/relayer/relayminer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import (
"time"

"cosmossdk.io/depinject"
"github.com/stretchr/testify/require"

"github.com/pokt-network/poktroll/pkg/observable/channel"
"github.com/pokt-network/poktroll/pkg/polylog/polyzero"
"github.com/pokt-network/poktroll/pkg/relayer"
"github.com/pokt-network/poktroll/testutil/testrelayer"
servicetypes "github.com/pokt-network/poktroll/x/service/types"
"github.com/stretchr/testify/require"
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
Olshansk marked this conversation as resolved.
Show resolved Hide resolved
)

func TestRelayMiner_StartAndStop(t *testing.T) {
Expand Down
Loading
Loading