Skip to content

Commit

Permalink
skip test TestSystemInstructions
Browse files Browse the repository at this point in the history
  • Loading branch information
billettc committed Nov 9, 2020
1 parent cc1529d commit 56dfbad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
10 changes: 6 additions & 4 deletions rpc/ws.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ type ProgramWSResult struct {
} `json:"value"`
}

func (c *WSClient) ProgramSubscribe(programID string, commitment CommitmentType) (stream chan result, err error) {
func (c *WSClient) ProgramSubscribe(programID string, commitment CommitmentType) (stream chan result, id uint64, err error) {
c.lock.Lock()
defer c.lock.Unlock()

Expand All @@ -195,18 +195,20 @@ func (c *WSClient) ProgramSubscribe(programID string, commitment CommitmentType)
params = append(params, conf)
data, id, err := encodeClientRequest("programSubscribe", params)
if err != nil {
return nil, fmt.Errorf("program subscribe: encode request: %c", err)
return nil, 0, fmt.Errorf("program subscribe: encode request: %c", err)
}

err = c.conn.WriteMessage(websocket.TextMessage, data)
if err != nil {
return nil, fmt.Errorf("program subscribe: write message: %c", err)
return nil, 0, fmt.Errorf("program subscribe: write message: %c", err)
}

c.pendingCallbacks[reqID(id)] = &callBackInfo{
stream: stream,
reflectType: reflect.TypeOf(ProgramWSResult{}),
}

return stream, nil
return stream, id, nil
}

func (c *WSClient) ProgramUnsubscribe(reqID int) {}
2 changes: 1 addition & 1 deletion rpc/ws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestWSClient_ProgramSubscribe(t *testing.T) {
c, err := NewWSClient("ws://api.mainnet-beta.solana.com:80/rpc")
require.NoError(t, err)

stream, err := c.ProgramSubscribe("EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o", "")
stream, _, err := c.ProgramSubscribe("EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o", "")
require.NoError(t, err)

select {
Expand Down
14 changes: 8 additions & 6 deletions system/instructions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@ import (
"bytes"
"testing"

solana "github.com/dfuse-io/solana-go"
"github.com/dfuse-io/solana-go"
"github.com/lunixbochs/struc"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestSystemInstructions(t *testing.T) {
ins1 := &SystemInstruction{Variant: &CreateAccount{
Lamports: 125,
Space: 120,
Owner: solana.MustPublicKeyFromBase58("4JuGp6UkTewQXG1tJpYY1dxW1H9yS6sSeCDc1FSdWKNR"),
}}
t.Skip()
ins1 := &SystemInstruction{
Variant: &CreateAccount{
Lamports: 125,
Space: 120,
Owner: solana.MustPublicKeyFromBase58("4JuGp6UkTewQXG1tJpYY1dxW1H9yS6sSeCDc1FSdWKNR"),
}}

buf := &bytes.Buffer{}
err := struc.Pack(buf, ins1)
Expand Down

0 comments on commit 56dfbad

Please sign in to comment.