Skip to content

fix variable/method names in avdl #4926

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

Closed
songgao wants to merge 2 commits into from
Closed

fix variable/method names in avdl #4926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b5aac
fix variable/method names in avdl
songgao Nov 22, 2016
032de8a
more fixes
songgao Nov 23, 2016
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
10 changes: 5 additions & 5 deletions go/protocol/chat1/gregor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
)

type GenericPayload struct {
Action string `codec:"Action" json:"Action"`
Action string `codec:"action" json:"action"`
}

type NewConversationPayload struct {
Action string `codec:"Action" json:"Action"`
Action string `codec:"action" json:"action"`
ConvID ConversationID `codec:"convID" json:"convID"`
InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"`
UnreadUpdate *UnreadUpdate `codec:"unreadUpdate,omitempty" json:"unreadUpdate,omitempty"`
Expand All @@ -27,15 +27,15 @@ type NewMessagePayload struct {
}

type ReadMessagePayload struct {
Action string `codec:"Action" json:"Action"`
Action string `codec:"action" json:"action"`
ConvID ConversationID `codec:"convID" json:"convID"`
MsgID MessageID `codec:"msgID" json:"msgID"`
InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"`
UnreadUpdate *UnreadUpdate `codec:"unreadUpdate,omitempty" json:"unreadUpdate,omitempty"`
}

type SetStatusPayload struct {
Action string `codec:"Action" json:"Action"`
Action string `codec:"action" json:"action"`
ConvID ConversationID `codec:"convID" json:"convID"`
Status ConversationStatus `codec:"status" json:"status"`
InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"`
Expand All @@ -44,7 +44,7 @@ type SetStatusPayload struct {

type UnreadUpdate struct {
ConvID ConversationID `codec:"convID" json:"convID"`
UnreadMessages int `codec:"UnreadMessages" json:"UnreadMessages"`
UnreadMessages int `codec:"unreadMessages" json:"unreadMessages"`
}

type GregorInterface interface {
Expand Down
32 changes: 16 additions & 16 deletions go/protocol/chat1/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ type OutboxRecord struct {
State OutboxState `codec:"state" json:"state"`
OutboxID OutboxID `codec:"outboxID" json:"outboxID"`
ConvID ConversationID `codec:"convID" json:"convID"`
Msg MessagePlaintext `codec:"Msg" json:"Msg"`
Msg MessagePlaintext `codec:"msg" json:"msg"`
}

type HeaderPlaintextVersion int
Expand Down Expand Up @@ -513,9 +513,9 @@ func NewMessageUnboxedWithOutbox(v OutboxRecord) MessageUnboxed {
}

type UnreadFirstNumLimit struct {
NumRead int `codec:"NumRead" json:"NumRead"`
AtLeast int `codec:"AtLeast" json:"AtLeast"`
AtMost int `codec:"AtMost" json:"AtMost"`
NumRead int `codec:"numRead" json:"numRead"`
AtLeast int `codec:"atLeast" json:"atLeast"`
AtMost int `codec:"atMost" json:"atMost"`
}

type ConversationInfoLocal struct {
Expand Down Expand Up @@ -621,8 +621,8 @@ type GetInboxSummaryForCLILocalRes struct {

type GetConversationForCLILocalQuery struct {
MarkAsRead bool `codec:"markAsRead" json:"markAsRead"`
MessageTypes []MessageType `codec:"MessageTypes" json:"MessageTypes"`
Since *string `codec:"Since,omitempty" json:"Since,omitempty"`
MessageTypes []MessageType `codec:"messageTypes" json:"messageTypes"`
Since *string `codec:"since,omitempty" json:"since,omitempty"`
Limit UnreadFirstNumLimit `codec:"limit" json:"limit"`
ConversationId ConversationID `codec:"conversationId" json:"conversationId"`
}
Expand Down Expand Up @@ -821,7 +821,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"SetConversationStatusLocal": {
"setConversationStatusLocal": {
MakeArg: func() interface{} {
ret := make([]SetConversationStatusLocalArg, 1)
return &ret
Expand Down Expand Up @@ -901,7 +901,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"GetMessagesLocal": {
"getMessagesLocal": {
MakeArg: func() interface{} {
ret := make([]GetMessagesLocalArg, 1)
return &ret
Expand All @@ -917,7 +917,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"DownloadAttachmentLocal": {
"downloadAttachmentLocal": {
MakeArg: func() interface{} {
ret := make([]DownloadAttachmentLocalArg, 1)
return &ret
Expand All @@ -933,7 +933,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"CancelPost": {
"cancelPost": {
MakeArg: func() interface{} {
ret := make([]CancelPostArg, 1)
return &ret
Expand All @@ -949,7 +949,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"RetryPost": {
"retryPost": {
MakeArg: func() interface{} {
ret := make([]RetryPostArg, 1)
return &ret
Expand Down Expand Up @@ -999,7 +999,7 @@ func (c LocalClient) PostLocalNonblock(ctx context.Context, __arg PostLocalNonbl
}

func (c LocalClient) SetConversationStatusLocal(ctx context.Context, __arg SetConversationStatusLocalArg) (res SetConversationStatusLocalRes, err error) {
err = c.Cli.Call(ctx, "chat.1.local.SetConversationStatusLocal", []interface{}{__arg}, &res)
err = c.Cli.Call(ctx, "chat.1.local.setConversationStatusLocal", []interface{}{__arg}, &res)
return
}

Expand All @@ -1026,23 +1026,23 @@ func (c LocalClient) GetConversationForCLILocal(ctx context.Context, query GetCo
}

func (c LocalClient) GetMessagesLocal(ctx context.Context, __arg GetMessagesLocalArg) (res GetMessagesLocalRes, err error) {
err = c.Cli.Call(ctx, "chat.1.local.GetMessagesLocal", []interface{}{__arg}, &res)
err = c.Cli.Call(ctx, "chat.1.local.getMessagesLocal", []interface{}{__arg}, &res)
return
}

func (c LocalClient) DownloadAttachmentLocal(ctx context.Context, __arg DownloadAttachmentLocalArg) (res DownloadAttachmentLocalRes, err error) {
err = c.Cli.Call(ctx, "chat.1.local.DownloadAttachmentLocal", []interface{}{__arg}, &res)
err = c.Cli.Call(ctx, "chat.1.local.downloadAttachmentLocal", []interface{}{__arg}, &res)
return
}

func (c LocalClient) CancelPost(ctx context.Context, outboxID OutboxID) (err error) {
__arg := CancelPostArg{OutboxID: outboxID}
err = c.Cli.Call(ctx, "chat.1.local.CancelPost", []interface{}{__arg}, nil)
err = c.Cli.Call(ctx, "chat.1.local.cancelPost", []interface{}{__arg}, nil)
return
}

func (c LocalClient) RetryPost(ctx context.Context, outboxID OutboxID) (err error) {
__arg := RetryPostArg{OutboxID: outboxID}
err = c.Cli.Call(ctx, "chat.1.local.RetryPost", []interface{}{__arg}, nil)
err = c.Cli.Call(ctx, "chat.1.local.retryPost", []interface{}{__arg}, nil)
return
}
4 changes: 2 additions & 2 deletions go/protocol/chat1/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func NotifyChatProtocol(i NotifyChatInterface) rpc.Protocol {
return rpc.Protocol{
Name: "chat.1.NotifyChat",
Methods: map[string]rpc.ServeHandlerDescription{
"NewChatActivity": {
"newChatActivity": {
MakeArg: func() interface{} {
ret := make([]NewChatActivityArg, 1)
return &ret
Expand All @@ -231,6 +231,6 @@ type NotifyChatClient struct {
}

func (c NotifyChatClient) NewChatActivity(ctx context.Context, __arg NewChatActivityArg) (err error) {
err = c.Cli.Notify(ctx, "chat.1.NotifyChat.NewChatActivity", []interface{}{__arg})
err = c.Cli.Notify(ctx, "chat.1.NotifyChat.newChatActivity", []interface{}{__arg})
return
}
8 changes: 4 additions & 4 deletions go/protocol/chat1/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func RemoteProtocol(i RemoteInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"SetConversationStatus": {
"setConversationStatus": {
MakeArg: func() interface{} {
ret := make([]SetConversationStatusArg, 1)
return &ret
Expand Down Expand Up @@ -301,7 +301,7 @@ func RemoteProtocol(i RemoteInterface) rpc.Protocol {
},
MethodType: rpc.MethodCall,
},
"GetUnreadUpdateFull": {
"getUnreadUpdateFull": {
MakeArg: func() interface{} {
ret := make([]GetUnreadUpdateFullArg, 1)
return &ret
Expand Down Expand Up @@ -394,7 +394,7 @@ func (c RemoteClient) MarkAsRead(ctx context.Context, __arg MarkAsReadArg) (res
}

func (c RemoteClient) SetConversationStatus(ctx context.Context, __arg SetConversationStatusArg) (res SetConversationStatusRes, err error) {
err = c.Cli.Call(ctx, "chat.1.remote.SetConversationStatus", []interface{}{__arg}, &res)
err = c.Cli.Call(ctx, "chat.1.remote.setConversationStatus", []interface{}{__arg}, &res)
return
}

Expand All @@ -406,7 +406,7 @@ func (c RemoteClient) TlfFinalize(ctx context.Context, tlfID TLFID) (err error)

func (c RemoteClient) GetUnreadUpdateFull(ctx context.Context, inboxVers InboxVers) (res UnreadUpdateFull, err error) {
__arg := GetUnreadUpdateFullArg{InboxVers: inboxVers}
err = c.Cli.Call(ctx, "chat.1.remote.GetUnreadUpdateFull", []interface{}{__arg}, &res)
err = c.Cli.Call(ctx, "chat.1.remote.getUnreadUpdateFull", []interface{}{__arg}, &res)
return
}

Expand Down
10 changes: 5 additions & 5 deletions protocol/avdl/chat1/gregor.avdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
protocol gregor {

record GenericPayload {
string Action;
string action;
}

record NewConversationPayload {
string Action;
string action;
ConversationID convID;
InboxVers inboxVers;
union { null, UnreadUpdate } unreadUpdate;
Expand All @@ -21,15 +21,15 @@ protocol gregor {
}

record ReadMessagePayload {
string Action;
string action;
ConversationID convID;
MessageID msgID;
InboxVers inboxVers;
union { null, UnreadUpdate } unreadUpdate;
}

record SetStatusPayload {
string Action;
string action;
ConversationID convID;
ConversationStatus status;
InboxVers inboxVers;
Expand All @@ -40,7 +40,7 @@ protocol gregor {
ConversationID convID;
// The count of unread messages to display
// Counts only visible types of messages deserving of a badge, no EDITs
int UnreadMessages;
int unreadMessages;
}

}
22 changes: 11 additions & 11 deletions protocol/avdl/chat1/local.avdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protocol local {
OutboxState state;
OutboxID outboxID;
ConversationID convID;
MessagePlaintext Msg;
MessagePlaintext msg;
}

enum HeaderPlaintextVersion {
Expand Down Expand Up @@ -157,10 +157,10 @@ protocol local {
// By definition, one could use a same non-zero number for both AtLeast and
// AtMost to precisely control the number of items returned.
record UnreadFirstNumLimit {
int NumRead;
int numRead;

int AtLeast;
int AtMost;
int atLeast;
int atMost;
}

record ConversationInfoLocal {
Expand Down Expand Up @@ -246,7 +246,7 @@ protocol local {
}
PostLocalNonblockRes postLocalNonblock(ConversationID conversationID, MessagePlaintext msg, MessageID clientPrev);

SetConversationStatusLocalRes SetConversationStatusLocal(ConversationID conversationID, ConversationStatus status);
SetConversationStatusLocalRes setConversationStatusLocal(ConversationID conversationID, ConversationStatus status);
record SetConversationStatusLocalRes {
array<RateLimit> rateLimits;
}
Expand Down Expand Up @@ -291,9 +291,9 @@ protocol local {
GetConversationForCLILocalRes getConversationForCLILocal(GetConversationForCLILocalQuery query);
record GetConversationForCLILocalQuery {
boolean markAsRead;
array<MessageType> MessageTypes;
array<MessageType> messageTypes;

union { null, string } Since;
union { null, string } since;

UnreadFirstNumLimit limit;

Expand All @@ -306,7 +306,7 @@ protocol local {
}

// Get messages by ID.
GetMessagesLocalRes GetMessagesLocal(ConversationID conversationID, array<MessageID> messageIDs);
GetMessagesLocalRes getMessagesLocal(ConversationID conversationID, array<MessageID> messageIDs);
record GetMessagesLocalRes {
array<MessageUnboxed> messages;
array<RateLimit> rateLimits;
Expand All @@ -316,9 +316,9 @@ protocol local {
record DownloadAttachmentLocalRes {
array<RateLimit> rateLimits;
}
DownloadAttachmentLocalRes DownloadAttachmentLocal(int sessionID, ConversationID conversationID, MessageID messageID, keybase1.Stream sink, boolean preview);
DownloadAttachmentLocalRes downloadAttachmentLocal(int sessionID, ConversationID conversationID, MessageID messageID, keybase1.Stream sink, boolean preview);

void CancelPost(OutboxID outboxID);
void RetryPost(OutboxID outboxID);
void cancelPost(OutboxID outboxID);
void retryPost(OutboxID outboxID);

}
2 changes: 1 addition & 1 deletion protocol/avdl/chat1/notify.avdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ protocol NotifyChat {
}

@notify("")
void NewChatActivity(keybase1.UID uid, ChatActivity activity);
void newChatActivity(keybase1.UID uid, ChatActivity activity);
}
4 changes: 2 additions & 2 deletions protocol/avdl/chat1/remote.avdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ protocol remote {

MarkAsReadRes markAsRead(ConversationID conversationID, MessageID msgID);

SetConversationStatusRes SetConversationStatus(ConversationID conversationID, ConversationStatus status);
SetConversationStatusRes setConversationStatus(ConversationID conversationID, ConversationStatus status);

// tlfFinalize is an endpoint for kbfstlfd to notify Gregor that a TLF ID has been finalized.
// Gregor keeps an internal record of these TLF IDs, so that it can always return the latest
// conversation per TLF ID on GetInboxRemote.
void tlfFinalize(TLFID tlfID);

UnreadUpdateFull GetUnreadUpdateFull(InboxVers inboxVers);
UnreadUpdateFull getUnreadUpdateFull(InboxVers inboxVers);
// The full set of updates of all convs in a single user's inbox
record UnreadUpdateFull {
// Set if this update should be ignored because the requester was already up to date
Expand Down
Loading