Skip to content

Commit

Permalink
Fix lint pt4
Browse files Browse the repository at this point in the history
  • Loading branch information
@psheth9
psheth9 committed Sep 7, 2024
1 parent 0870ea9 commit a36dd93
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
84 changes: 42 additions & 42 deletions cmd/soroban-rpc/internal/methods/get_events_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func TestEventTypeSetValid(t *testing.T) {
if testCase.expectedError {
assert.Error(t, set.valid())
} else {
assert.NoError(t, set.valid())
require.NoError(t, set.valid())
}
})
}
Expand Down Expand Up @@ -189,9 +189,9 @@ func TestEventTypeSetMarshaling(t *testing.T) {
t.Run(testCase.name, func(t *testing.T) {
var set eventTypeSet
input, err := json.Marshal(testCase.input)
assert.NoError(t, err)
require.NoError(t, err)
err = set.UnmarshalJSON(input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, len(testCase.expected), len(set))
for _, val := range testCase.expected {
_, ok := set[val]
Expand Down Expand Up @@ -369,18 +369,18 @@ func TestTopicFilterMatches(t *testing.T) {
func TestTopicFilterJSON(t *testing.T) {
var got TopicFilter

assert.NoError(t, json.Unmarshal([]byte("[]"), &got))
require.NoError(t, json.Unmarshal([]byte("[]"), &got))
assert.Equal(t, TopicFilter{}, got)

star := "*"
assert.NoError(t, json.Unmarshal([]byte("[\"*\"]"), &got))
require.NoError(t, json.Unmarshal([]byte("[\"*\"]"), &got))
assert.Equal(t, TopicFilter{{wildcard: &star}}, got)

sixtyfour := xdr.Uint64(64)
scval := xdr.ScVal{Type: xdr.ScValTypeScvU64, U64: &sixtyfour}
scvalstr, err := xdr.MarshalBase64(scval)
assert.NoError(t, err)
assert.NoError(t, json.Unmarshal([]byte(fmt.Sprintf("[%q]", scvalstr)), &got))
require.NoError(t, err)
require.NoError(t, json.Unmarshal([]byte(fmt.Sprintf("[%q]", scvalstr)), &got))
assert.Equal(t, TopicFilter{{scval: &scval}}, got)
}

Expand Down Expand Up @@ -408,54 +408,54 @@ func topicFilterToString(t TopicFilter) string {
func TestGetEventsRequestValid(t *testing.T) {
// omit startLedger but include cursor
var request GetEventsRequest
assert.NoError(t, json.Unmarshal(
require.NoError(t, json.Unmarshal(
[]byte("{ \"filters\": [], \"pagination\": { \"cursor\": \"0000000021474840576-0000000000\"} }"),
&request,
))
assert.Equal(t, uint32(0), request.StartLedger)
assert.NoError(t, request.Valid(1000))
require.NoError(t, request.Valid(1000))

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{},
Pagination: &PaginationOptions{Cursor: &db.Cursor{}},
}).Valid(1000), "ledger ranges and cursor cannot both be set")

assert.NoError(t, (&GetEventsRequest{
require.NoError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{},
Pagination: nil,
}).Valid(1000))

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{},
Pagination: &PaginationOptions{Limit: 1001},
}).Valid(1000), "limit must not exceed 1000")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 0,
Filters: []EventFilter{},
Pagination: nil,
}).Valid(1000), "startLedger must be positive")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{}, {}, {}, {}, {}, {},
},
Pagination: nil,
}).Valid(1000), "maximum 5 filters per request")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{EventType: map[string]interface{}{"foo": nil}},
},
Pagination: nil,
}).Valid(1000), "filter 1 invalid: filter type invalid: if set, type must be either 'system', 'contract' or 'diagnostic'")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{ContractIDs: []string{
Expand All @@ -470,23 +470,23 @@ func TestGetEventsRequestValid(t *testing.T) {
Pagination: nil,
}).Valid(1000), "filter 1 invalid: maximum 5 contract IDs per filter")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{ContractIDs: []string{"a"}},
},
Pagination: nil,
}).Valid(1000), "filter 1 invalid: contract ID 1 invalid")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{ContractIDs: []string{"CCVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVKVINVALID"}},
},
Pagination: nil,
}).Valid(1000), "filter 1 invalid: contract ID 1 invalid")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{
Expand All @@ -498,7 +498,7 @@ func TestGetEventsRequestValid(t *testing.T) {
Pagination: nil,
}).Valid(1000), "filter 1 invalid: maximum 5 topics per filter")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{Topics: []TopicFilter{
Expand All @@ -508,7 +508,7 @@ func TestGetEventsRequestValid(t *testing.T) {
Pagination: nil,
}).Valid(1000), "filter 1 invalid: topic 1 invalid: topic must have at least one segment")

assert.EqualError(t, (&GetEventsRequest{
require.EqualError(t, (&GetEventsRequest{
StartLedger: 1,
Filters: []EventFilter{
{Topics: []TopicFilter{
Expand All @@ -530,7 +530,7 @@ func TestGetEvents(t *testing.T) {
counter := xdr.ScSymbol("COUNTER")
counterScVal := xdr.ScVal{Type: xdr.ScValTypeScvSymbol, Sym: &counter}
counterXdr, err := xdr.MarshalBase64(counterScVal)
assert.NoError(t, err)
require.NoError(t, err)

t.Run("startLedger validation", func(t *testing.T) {
contractID := xdr.Hash([32]byte{})
Expand Down Expand Up @@ -562,7 +562,7 @@ func TestGetEvents(t *testing.T) {

ledgerCloseMeta := ledgerCloseMetaWithEvents(2, now.Unix(), txMeta...)
require.NoError(t, ledgerW.InsertLedger(ledgerCloseMeta), "ingestion failed for ledger ")
assert.NoError(t, eventW.InsertEvents(ledgerCloseMeta))
require.NoError(t, eventW.InsertEvents(ledgerCloseMeta))
require.NoError(t, write.Commit(ledgerCloseMeta))

handler := eventsRPCHandler{
Expand Down Expand Up @@ -615,7 +615,7 @@ func TestGetEvents(t *testing.T) {

ledgerCloseMeta := ledgerCloseMetaWithEvents(1, now.Unix(), txMeta...)
require.NoError(t, ledgerW.InsertLedger(ledgerCloseMeta), "ingestion failed for ledger ")
assert.NoError(t, eventW.InsertEvents(ledgerCloseMeta))
require.NoError(t, eventW.InsertEvents(ledgerCloseMeta))
require.NoError(t, write.Commit(ledgerCloseMeta))

handler := eventsRPCHandler{
Expand All @@ -627,7 +627,7 @@ func TestGetEvents(t *testing.T) {
results, err := handler.getEvents(context.TODO(), GetEventsRequest{
StartLedger: 1,
})
assert.NoError(t, err)
require.NoError(t, err)

var expected []EventInfo
for i := range txMeta {
Expand All @@ -641,7 +641,7 @@ func TestGetEvents(t *testing.T) {
Type: xdr.ScValTypeScvSymbol,
Sym: &counter,
})
assert.NoError(t, err)
require.NoError(t, err)
expected = append(expected, EventInfo{
EventType: EventTypeContract,
Ledger: 1,
Expand Down Expand Up @@ -676,7 +676,7 @@ func TestGetEvents(t *testing.T) {
xdr.Hash([32]byte{}),
xdr.Hash([32]byte{1}),
}
for i := 0; i < 5; i++ {
for i := range 5 {
txMeta = append(txMeta, transactionMetaWithEvents(
contractEvent(
contractIDs[i%len(contractIDs)],
Expand Down Expand Up @@ -709,7 +709,7 @@ func TestGetEvents(t *testing.T) {
{ContractIDs: []string{strkey.MustEncode(strkey.VersionByteContract, contractIDs[0][:])}},
},
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, uint32(1), results.LatestLedger)

expectedIds := []string{
Expand Down Expand Up @@ -777,16 +777,16 @@ func TestGetEvents(t *testing.T) {
}},
},
})
assert.NoError(t, err)
require.NoError(t, err)

id := db.Cursor{Ledger: 1, Tx: 5, Op: 0, Event: 0}.String()
assert.NoError(t, err)
require.NoError(t, err)
scVal := xdr.ScVal{
Type: xdr.ScValTypeScvU64,
U64: &number,
}
value, err := xdr.MarshalBase64(scVal)
assert.NoError(t, err)
require.NoError(t, err)
expected := []EventInfo{
{
EventType: EventTypeContract,
Expand Down Expand Up @@ -924,14 +924,14 @@ func TestGetEvents(t *testing.T) {
},
},
})
assert.NoError(t, err)
require.NoError(t, err)

id := db.Cursor{Ledger: 1, Tx: 4, Op: 0, Event: 0}.String()
value, err := xdr.MarshalBase64(xdr.ScVal{
Type: xdr.ScValTypeScvU64,
U64: &number,
})
assert.NoError(t, err)
require.NoError(t, err)
expected := []EventInfo{
{
EventType: EventTypeContract,
Expand Down Expand Up @@ -1004,7 +1004,7 @@ func TestGetEvents(t *testing.T) {
{EventType: map[string]interface{}{EventTypeSystem: nil}},
},
})
assert.NoError(t, err)
require.NoError(t, err)

id := db.Cursor{Ledger: 1, Tx: 1, Op: 0, Event: 1}.String()
expected := []EventInfo{
Expand Down Expand Up @@ -1039,7 +1039,7 @@ func TestGetEvents(t *testing.T) {

contractID := xdr.Hash([32]byte{})
var txMeta []xdr.TransactionMeta
for i := 0; i < 180; i++ {
for i := range 180 {
number := xdr.Uint64(i)
txMeta = append(txMeta, transactionMetaWithEvents(
contractEvent(
Expand Down Expand Up @@ -1067,18 +1067,18 @@ func TestGetEvents(t *testing.T) {
Filters: []EventFilter{},
Pagination: &PaginationOptions{Limit: 10},
})
assert.NoError(t, err)
require.NoError(t, err)

var expected []EventInfo
for i := 0; i < 10; i++ {
for i := range 10 {
id := db.Cursor{
Ledger: 1,
Tx: uint32(i + 1),
Op: 0,
Event: 0,
}.String()
value, err := xdr.MarshalBase64(txMeta[i].MustV3().SorobanMeta.Events[0].Body.MustV0().Data)
assert.NoError(t, err)
require.NoError(t, err)
expected = append(expected, EventInfo{
EventType: EventTypeContract,
Ledger: 1,
Expand Down Expand Up @@ -1168,7 +1168,7 @@ func TestGetEvents(t *testing.T) {
Limit: 2,
},
})
assert.NoError(t, err)
require.NoError(t, err)

var expected []EventInfo
expectedIDs := []string{
Expand All @@ -1178,7 +1178,7 @@ func TestGetEvents(t *testing.T) {
symbols := datas[1:3]
for i, id := range expectedIDs {
expectedXdr, err := xdr.MarshalBase64(xdr.ScVal{Type: xdr.ScValTypeScvSymbol, Sym: &symbols[i]})
assert.NoError(t, err)
require.NoError(t, err)
expected = append(expected, EventInfo{
EventType: EventTypeContract,
Ledger: 5,
Expand All @@ -1200,7 +1200,7 @@ func TestGetEvents(t *testing.T) {
Limit: 2,
},
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, GetEventsResponse{[]EventInfo{}, 5}, results)
})
}
Expand Down Expand Up @@ -1427,7 +1427,7 @@ func newTestDB(tb testing.TB) *db.DB {
db, err := db.OpenSQLiteDB(dbPath)
require.NoError(tb, err)
tb.Cleanup(func() {
assert.NoError(tb, db.Close())
require.NoError(tb, db.Close())
})
return db
}
6 changes: 3 additions & 3 deletions cmd/soroban-rpc/internal/methods/get_ledger_entry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import (
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/xdr2json"
)

// Deprecated. Use GetLedgerEntriesRequest instead.
// GetLedgerEntryRequest Deprecated: Use GetLedgerEntriesRequest instead.
// TODO(https://github.com/stellar/soroban-tools/issues/374) remove after getLedgerEntries is deployed.
type GetLedgerEntryRequest struct {
Key string `json:"key"`
Format string `json:"xdrFormat"`
}

// Deprecated. Use GetLedgerEntriesResponse instead.
// GetLedgerEntryResponse Deprecated: Use GetLedgerEntriesResponse instead.
// TODO(https://github.com/stellar/soroban-tools/issues/374) remove after getLedgerEntries is deployed.
type GetLedgerEntryResponse struct {
EntryXDR string `json:"xdr"`
Expand All @@ -35,7 +35,7 @@ type GetLedgerEntryResponse struct {
}

// NewGetLedgerEntryHandler returns a json rpc handler to retrieve the specified ledger entry from stellar core
// Deprecated. use NewGetLedgerEntriesHandler instead.
// Deprecated: use NewGetLedgerEntriesHandler instead
// TODO(https://github.com/stellar/soroban-tools/issues/374) remove after getLedgerEntries is deployed.
func NewGetLedgerEntryHandler(logger *log.Entry, ledgerEntryReader db.LedgerEntryReader) jrpc2.Handler {
return NewHandler(func(ctx context.Context, request GetLedgerEntryRequest) (GetLedgerEntryResponse, error) {
Expand Down

0 comments on commit a36dd93

Please sign in to comment.