Skip to content

Commit f086d47

Browse files
committed
Moved SketchProfileLibraryReference in the proper commono.proto file
1 parent fe60757 commit f086d47

File tree

7 files changed

+1089
-1084
lines changed

7 files changed

+1089
-1084
lines changed

internal/arduino/sketch/profiles.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -420,19 +420,19 @@ func (l *ProfileLibraryReference) Match(other *ProfileLibraryReference) bool {
420420
}
421421

422422
// ToRpc converts this ProfileLibraryReference to an rpc.ProfileLibraryReference
423-
func (l *ProfileLibraryReference) ToRpc() *rpc.ProfileLibraryReference {
423+
func (l *ProfileLibraryReference) ToRpc() *rpc.SketchProfileLibraryReference {
424424
if l.InstallDir != nil {
425-
return &rpc.ProfileLibraryReference{
426-
Library: &rpc.ProfileLibraryReference_LocalLibrary_{
427-
LocalLibrary: &rpc.ProfileLibraryReference_LocalLibrary{
425+
return &rpc.SketchProfileLibraryReference{
426+
Library: &rpc.SketchProfileLibraryReference_LocalLibrary_{
427+
LocalLibrary: &rpc.SketchProfileLibraryReference_LocalLibrary{
428428
Path: l.InstallDir.String(),
429429
},
430430
},
431431
}
432432
}
433-
return &rpc.ProfileLibraryReference{
434-
Library: &rpc.ProfileLibraryReference_IndexLibrary_{
435-
IndexLibrary: &rpc.ProfileLibraryReference_IndexLibrary{
433+
return &rpc.SketchProfileLibraryReference{
434+
Library: &rpc.SketchProfileLibraryReference_IndexLibrary_{
435+
IndexLibrary: &rpc.SketchProfileLibraryReference_IndexLibrary{
436436
Name: l.Library,
437437
Version: l.Version.String(),
438438
},
@@ -441,7 +441,7 @@ func (l *ProfileLibraryReference) ToRpc() *rpc.ProfileLibraryReference {
441441
}
442442

443443
// FromRpcProfileLibraryReference converts an rpc.ProfileLibraryReference to a ProfileLibraryReference
444-
func FromRpcProfileLibraryReference(l *rpc.ProfileLibraryReference) (*ProfileLibraryReference, error) {
444+
func FromRpcProfileLibraryReference(l *rpc.SketchProfileLibraryReference) (*ProfileLibraryReference, error) {
445445
if localLib := l.GetLocalLibrary(); localLib != nil {
446446
path := paths.New(localLib.GetPath())
447447
if path == nil {

internal/cli/feedback/result/rpc.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,23 +1126,23 @@ func NewIndexUpdateReport_Status(r rpc.IndexUpdateReport_Status) IndexUpdateRepo
11261126
}
11271127
}
11281128

1129-
type ProfileLibraryReference_LocalLibraryResult struct {
1129+
type SketchProfileLibraryReference_LocalLibraryResult struct {
11301130
Path string `json:"path,omitempty"`
11311131
}
11321132

1133-
func NewProfileLibraryReference_LocalLibraryResult(resp *rpc.ProfileLibraryReference_LocalLibrary) *ProfileLibraryReference_LocalLibraryResult {
1134-
return &ProfileLibraryReference_LocalLibraryResult{
1133+
func NewSketchProfileLibraryReference_LocalLibraryResult(resp *rpc.SketchProfileLibraryReference_LocalLibrary) *SketchProfileLibraryReference_LocalLibraryResult {
1134+
return &SketchProfileLibraryReference_LocalLibraryResult{
11351135
Path: resp.GetPath(),
11361136
}
11371137
}
11381138

1139-
type ProfileLibraryReference_IndexLibraryResult struct {
1139+
type SketchProfileLibraryReference_IndexLibraryResult struct {
11401140
Name string `json:"name,omitempty"`
11411141
Version string `json:"version,omitempty"`
11421142
}
11431143

1144-
func NewProfileLibraryReference_IndexLibraryResult(resp *rpc.ProfileLibraryReference_IndexLibrary) *ProfileLibraryReference_IndexLibraryResult {
1145-
return &ProfileLibraryReference_IndexLibraryResult{
1144+
func NewSketchProfileLibraryReference_IndexLibraryResult(resp *rpc.SketchProfileLibraryReference_IndexLibrary) *SketchProfileLibraryReference_IndexLibraryResult {
1145+
return &SketchProfileLibraryReference_IndexLibraryResult{
11461146
Name: resp.GetName(),
11471147
Version: resp.GetVersion(),
11481148
}

internal/cli/feedback/result/rpc_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ func TestAllFieldAreMapped(t *testing.T) {
234234
indexUpdateReportResult := result.NewIndexUpdateReportResult(indexUpdateReportRpc)
235235
mustContainsAllPropertyOfRpcStruct(t, indexUpdateReportRpc, indexUpdateReportResult)
236236

237-
profileLibraryReference_IndexLibraryRpc := &rpc.ProfileLibraryReference_IndexLibrary{}
238-
profileLibraryReference_IndexLibraryResult := result.NewProfileLibraryReference_IndexLibraryResult(profileLibraryReference_IndexLibraryRpc)
239-
mustContainsAllPropertyOfRpcStruct(t, profileLibraryReference_IndexLibraryRpc, profileLibraryReference_IndexLibraryResult)
237+
sketchProfileLibraryReference_IndexLibraryRpc := &rpc.SketchProfileLibraryReference_IndexLibrary{}
238+
sketchProfileLibraryReference_IndexLibraryResult := result.NewSketchProfileLibraryReference_IndexLibraryResult(sketchProfileLibraryReference_IndexLibraryRpc)
239+
mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_IndexLibraryRpc, sketchProfileLibraryReference_IndexLibraryResult)
240240

241-
profileLibraryReference_LocalLibraryRpc := &rpc.ProfileLibraryReference_LocalLibrary{}
242-
profileLibraryReference_LocalLibraryResult := result.NewProfileLibraryReference_LocalLibraryResult(profileLibraryReference_LocalLibraryRpc)
243-
mustContainsAllPropertyOfRpcStruct(t, profileLibraryReference_LocalLibraryRpc, profileLibraryReference_LocalLibraryResult)
241+
sketchProfileLibraryReference_LocalLibraryRpc := &rpc.SketchProfileLibraryReference_LocalLibrary{}
242+
sketchProfileLibraryReference_LocalLibraryResult := result.NewSketchProfileLibraryReference_LocalLibraryResult(sketchProfileLibraryReference_LocalLibraryRpc)
243+
mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_LocalLibraryRpc, sketchProfileLibraryReference_LocalLibraryResult)
244244
}
245245

246246
func TestEnumsMapsEveryRpcCounterpart(t *testing.T) {

0 commit comments

Comments
 (0)