Skip to content

fix: rename i_pv4s and i_pv6s to ipv4s and ipv6s for consistency #6

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
Redmomn merged 1 commit into from
Feb 27, 2026
Merged

fix: rename i_pv4s and i_pv6s to ipv4s and ipv6s for consistency #6

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
2 changes: 1 addition & 1 deletion proto/service/highway/v1/highway.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}

message NTHighwayNetwork {
repeated NTHighwayIPv4 i_pv4s = 1;
repeated NTHighwayIPv4 ipv4s = 1;

Check failure on line 99 in proto/service/highway/v1/highway.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" on message "NTHighwayNetwork" changed name from "i_pv4s" to "ipv4s".

Check failure on line 99 in proto/service/highway/v1/highway.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" with name "ipv4s" on message "NTHighwayNetwork" changed option "json_name" from "iPv4s" to "ipv4s".
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

As with the v2 schema: this rename is wire-compatible but changes the generated accessor/JSON field name. Consider reserving the old name (i_pv4s) inside NTHighwayNetwork to prevent it from being reused in a future change.

Suggested change
repeated NTHighwayIPv4 ipv4s = 1;
repeated NTHighwayIPv4 ipv4s = 1;
reserved "i_pv4s";

Copilot uses AI. Check for mistakes.
}

message NTHighwayIPv4 {
Expand Down
12 changes: 6 additions & 6 deletions proto/service/highway/v1/ntv_2_rich_media_resp.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
string domain = 1;
string url_path = 2;
uint32 https_port = 3;
repeated IPv4 i_pv4s = 4;
repeated IPv6 i_pv6s = 5;
repeated IPv4 ipv4s = 4;

Check failure on line 37 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "4" on message "DownloadInfo" changed name from "i_pv4s" to "ipv4s".

Check failure on line 37 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "4" with name "ipv4s" on message "DownloadInfo" changed option "json_name" from "iPv4s" to "ipv4s".
repeated IPv6 ipv6s = 5;

Check failure on line 38 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "5" on message "DownloadInfo" changed name from "i_pv6s" to "ipv6s".

Check failure on line 38 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "5" with name "ipv6s" on message "DownloadInfo" changed option "json_name" from "iPv6s" to "ipv6s".
PicUrlExtInfo pic_url_ext_info = 6;
VideoExtInfo video_ext_info = 7;
}
Expand All @@ -59,8 +59,8 @@
message UploadResp {
optional string u_key = 1;
uint32 u_key_ttl_second = 2;
repeated IPv4 i_pv4s = 3;
repeated IPv6 i_pv6s = 4;
repeated IPv4 ipv4s = 3;

Check failure on line 62 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "3" on message "UploadResp" changed name from "i_pv4s" to "ipv4s".

Check failure on line 62 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "3" with name "ipv4s" on message "UploadResp" changed option "json_name" from "iPv4s" to "ipv4s".
repeated IPv6 ipv6s = 4;

Check failure on line 63 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "4" on message "UploadResp" changed name from "i_pv6s" to "ipv6s".

Check failure on line 63 in proto/service/highway/v1/ntv_2_rich_media_resp.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "4" with name "ipv6s" on message "UploadResp" changed option "json_name" from "iPv6s" to "ipv6s".
Comment on lines 59 to +63
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

Same compatibility issue: renaming these fields changes generated API/JSON names. Consider reserving i_pv4s/i_pv6s inside UploadResp so the old names can’t be reused in later schema changes.

Copilot uses AI. Check for mistakes.
uint64 msg_seq = 5;
MsgInfo msg_info = 6;
repeated RichMediaStorageTransInfo ext = 7;
Expand All @@ -78,8 +78,8 @@
uint32 sub_type = 1;
string u_key = 2;
uint32 u_key_ttl_second = 3;
repeated IPv4 i_pv4s = 4;
repeated IPv6 i_pv6s = 5;
repeated IPv4 ipv4s = 4;
repeated IPv6 ipv6s = 5;
Comment on lines 78 to +82
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

Same here: the field numbers stay the same, but the rename changes generated API/JSON names. Consider reserving the old field names (i_pv4s, i_pv6s) within SubFileInfo to prevent accidental reuse later.

Copilot uses AI. Check for mistakes.
}

message DownloadSafeResp {}
Expand Down
14 changes: 7 additions & 7 deletions proto/service/highway/v2/highway.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ message NTHighwayHash {
}

message NTHighwayNetwork {
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

This field rename keeps the wire number (1) but changes the generated accessor name and the default JSON field name. To avoid accidental reintroduction of the old name later, consider reserving the previous field name (e.g., reserved "i_pv4s";) within this message (and use json_name only if you need to preserve the old JSON name for compatibility).

Suggested change
message NTHighwayNetwork {
message NTHighwayNetwork {
reserved "i_pv4s";

Copilot uses AI. Check for mistakes.
repeated NTHighwayIPv4 i_pv4s = 1;
repeated NTHighwayIPv4 ipv4s = 1;
}

message NTHighwayIPv4 {
Expand Down Expand Up @@ -336,8 +336,8 @@ message DownloadInfo {
optional string domain = 1;
optional string url_path = 2;
optional uint32 https_port = 3;
repeated IPv4 i_pv4s = 4;
repeated IPv6 i_pv6s = 5;
repeated IPv4 ipv4s = 4;
repeated IPv6 ipv6s = 5;
Comment on lines +339 to +340
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

Renaming these fields changes generated API/JSON names even though the field numbers stay the same. Consider reserving the old names (i_pv4s, i_pv6s) inside DownloadInfo to prevent reuse and to make the compatibility intent explicit (and set json_name only if you must preserve the previous JSON keys).

Suggested change
repeated IPv4 ipv4s = 4;
repeated IPv6 ipv6s = 5;
reserved "i_pv4s", "i_pv6s";
repeated IPv4 ipv4s = 4 [json_name = "i_pv4s"];
repeated IPv6 ipv6s = 5 [json_name = "i_pv6s"];

Copilot uses AI. Check for mistakes.
optional PicUrlExtInfo pic_url_ext_info = 6;
optional VideoExtInfo video_ext_info = 7;
}
Expand All @@ -361,8 +361,8 @@ message IPv6 {
message UploadResp {
optional string u_key = 1;
optional uint32 u_key_ttl_second = 2;
repeated IPv4 i_pv4s = 3;
repeated IPv6 i_pv6s = 4;
repeated IPv4 ipv4s = 3;
repeated IPv6 ipv6s = 4;
Comment on lines 361 to +365
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

Same compatibility concern here: the rename changes generated API/JSON names. Please consider reserving i_pv4s/i_pv6s within UploadResp to prevent the old identifiers from being reused in future schema edits.

Copilot uses AI. Check for mistakes.
optional uint64 msg_seq = 5;
optional MsgInfo msg_info = 6;
repeated RichMediaStorageTransInfo ext = 7;
Expand All @@ -380,8 +380,8 @@ message SubFileInfo {
optional uint32 sub_type = 1;
optional string u_key = 2;
optional uint32 u_key_ttl_second = 3;
repeated IPv4 i_pv4s = 4;
repeated IPv6 i_pv6s = 5;
repeated IPv4 ipv4s = 4;
repeated IPv6 ipv6s = 5;
Comment on lines 380 to +384
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

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

Same as above: consider reserving the previous field names (i_pv4s, i_pv6s) within SubFileInfo after this rename, since the wire numbers remain but the public/generated names change.

Copilot uses AI. Check for mistakes.
}

message DownloadSafeResp {}
Expand Down