Skip to content

wsReader cannot rely on testing.T as it might extend past test scope #472

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

Merged
merged 1 commit into from
Feb 4, 2022
Merged

wsReader cannot rely on testing.T as it might extend past test scope #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,32 +259,38 @@ func beforeE2ETest(t *testing.T) *testState {
return ts
}

func wsReader(t *testing.T, conn *websocket.Conn) (chan *fftypes.EventDelivery, chan *fftypes.ChangeEvent) {
func wsReader(conn *websocket.Conn) (chan *fftypes.EventDelivery, chan *fftypes.ChangeEvent) {
events := make(chan *fftypes.EventDelivery, 100)
changeEvents := make(chan *fftypes.ChangeEvent, 100)
go func() {
for {
_, b, err := conn.ReadMessage()
if err != nil {
t.Logf("Websocket %s closing, error: %s", conn.RemoteAddr(), err)
fmt.Printf("Websocket %s closing, error: %s", conn.RemoteAddr(), err)
return
}
t.Logf("Websocket %s receive: %s", conn.RemoteAddr(), b)
fmt.Printf("Websocket %s receive: %s", conn.RemoteAddr(), b)
var wsa fftypes.WSClientActionBase
err = json.Unmarshal(b, &wsa)
assert.NoError(t, err)
if err != nil {
panic(fmt.Errorf("Invalid JSON received on WebSocket: %s", err))
}
switch wsa.Type {
case fftypes.WSClientActionChangeNotifcation:
var wscn fftypes.WSChangeNotification
err = json.Unmarshal(b, &wscn)
assert.NoError(t, err)
if err != nil {
panic(fmt.Errorf("Invalid JSON received on WebSocket: %s", err))
}
if err == nil {
changeEvents <- wscn.ChangeEvent
}
default:
var ed fftypes.EventDelivery
err = json.Unmarshal(b, &ed)
assert.NoError(t, err)
if err != nil {
panic(fmt.Errorf("Invalid JSON received on WebSocket: %s", err))
}
if err == nil {
events <- &ed
}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/ethereum_contract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func (suite *EthereumContractTestSuite) BeforeTest(suiteName, testName string) {
func (suite *EthereumContractTestSuite) TestE2EContractEvents() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received1, changes1 := wsReader(suite.testState.ws1)

sub := CreateContractSubscription(suite.T(), suite.testState.client1, simpleStorageFFIChanged(), &fftypes.JSONObject{
"address": suite.contractAddress,
Expand Down Expand Up @@ -230,7 +230,7 @@ func (suite *EthereumContractTestSuite) TestE2EContractEvents() {
func (suite *EthereumContractTestSuite) TestDirectInvokeMethod() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received1, changes1 := wsReader(suite.testState.ws1)

sub := CreateContractSubscription(suite.T(), suite.testState.client1, simpleStorageFFIChanged(), &fftypes.JSONObject{
"address": suite.contractAddress,
Expand Down Expand Up @@ -286,7 +286,7 @@ func (suite *EthereumContractTestSuite) TestDirectInvokeMethod() {
func (suite *EthereumContractTestSuite) TestFFIInvokeMethod() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received1, changes1 := wsReader(suite.testState.ws1)

sub := CreateContractSubscription(suite.T(), suite.testState.client1, simpleStorageFFIChanged(), &fftypes.JSONObject{
"address": suite.contractAddress,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fabric_contract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (suite *FabricContractTestSuite) BeforeTest(suiteName, testName string) {
func (suite *FabricContractTestSuite) TestE2EContractEvents() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received1, changes1 := wsReader(suite.testState.ws1)

sub := CreateContractSubscription(suite.T(), suite.testState.client1, assetCreatedEvent, &fftypes.JSONObject{
"channel": "firefly",
Expand Down
28 changes: 14 additions & 14 deletions test/e2e/onchain_offchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func (suite *OnChainOffChainTestSuite) BeforeTest(suiteName, testName string) {
func (suite *OnChainOffChainTestSuite) TestE2EBroadcast() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received2, changes2 := wsReader(suite.T(), suite.testState.ws2)
received1, changes1 := wsReader(suite.testState.ws1)
received2, changes2 := wsReader(suite.testState.ws2)

var resp *resty.Response
value := fftypes.JSONAnyPtr(`"Hello"`)
Expand All @@ -74,8 +74,8 @@ func (suite *OnChainOffChainTestSuite) TestE2EBroadcast() {
func (suite *OnChainOffChainTestSuite) TestStrongDatatypesBroadcast() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received2, changes2 := wsReader(suite.T(), suite.testState.ws2)
received1, changes1 := wsReader(suite.testState.ws1)
received2, changes2 := wsReader(suite.testState.ws2)

var resp *resty.Response
value := fftypes.JSONAnyPtr(`"Hello"`)
Expand Down Expand Up @@ -125,8 +125,8 @@ func (suite *OnChainOffChainTestSuite) TestStrongDatatypesBroadcast() {
func (suite *OnChainOffChainTestSuite) TestStrongDatatypesPrivate() {
defer suite.testState.done()

received1, changes1 := wsReader(suite.T(), suite.testState.ws1)
received2, changes2 := wsReader(suite.T(), suite.testState.ws2)
received1, changes1 := wsReader(suite.testState.ws1)
received2, changes2 := wsReader(suite.testState.ws2)

var resp *resty.Response
value := fftypes.JSONAnyPtr(`{"foo":"bar"}`)
Expand Down Expand Up @@ -185,8 +185,8 @@ func (suite *OnChainOffChainTestSuite) TestStrongDatatypesPrivate() {
func (suite *OnChainOffChainTestSuite) TestE2EPrivate() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

var resp *resty.Response
value := fftypes.JSONAnyPtr(`"Hello"`)
Expand All @@ -213,8 +213,8 @@ func (suite *OnChainOffChainTestSuite) TestE2EPrivate() {
func (suite *OnChainOffChainTestSuite) TestE2EBroadcastBlob() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

var resp *resty.Response

Expand All @@ -239,8 +239,8 @@ func (suite *OnChainOffChainTestSuite) TestE2EBroadcastBlob() {
func (suite *OnChainOffChainTestSuite) TestE2EPrivateBlobDatatypeTagged() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

var resp *resty.Response

Expand Down Expand Up @@ -269,8 +269,8 @@ func (suite *OnChainOffChainTestSuite) TestE2EPrivateBlobDatatypeTagged() {
func (suite *OnChainOffChainTestSuite) TestE2EWebhookExchange() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

subJSON := `{
"transport": "webhooks",
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/tokens_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (suite *TokensTestSuite) BeforeTest(suiteName, testName string) {
func (suite *TokensTestSuite) TestE2EFungibleTokensAsync() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

pools := GetTokenPools(suite.T(), suite.testState.client1, time.Unix(0, 0))
poolName := fmt.Sprintf("pool%d", len(pools))
Expand Down Expand Up @@ -184,8 +184,8 @@ func (suite *TokensTestSuite) TestE2EFungibleTokensAsync() {
func (suite *TokensTestSuite) TestE2ENonFungibleTokensSync() {
defer suite.testState.done()

received1, _ := wsReader(suite.T(), suite.testState.ws1)
received2, _ := wsReader(suite.T(), suite.testState.ws2)
received1, _ := wsReader(suite.testState.ws1)
received2, _ := wsReader(suite.testState.ws2)

pools := GetTokenPools(suite.T(), suite.testState.client1, time.Unix(0, 0))
poolName := fmt.Sprintf("pool%d", len(pools))
Expand Down