Skip to content

Commit

Permalink
go1.12.4 fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
heronhaye committed Apr 25, 2019
1 parent b19d8cf commit 23dda21
Show file tree
Hide file tree
Showing 25 changed files with 169 additions and 170 deletions.
2 changes: 1 addition & 1 deletion go/chat/flip/prot.go
Expand Up @@ -32,7 +32,7 @@ func (o Start) DeepCopy() Start {
RevealWindowMsec: o.RevealWindowMsec,
SlackMsec: o.SlackMsec,
CommitmentCompleteWindowMsec: o.CommitmentCompleteWindowMsec,
Params: o.Params.DeepCopy(),
Params: o.Params.DeepCopy(),
}
}

Expand Down
8 changes: 4 additions & 4 deletions go/chat/push.go
Expand Up @@ -579,10 +579,10 @@ func (g *PushHandler) Activity(ctx context.Context, m gregor.OutOfBandMessage) (
}
activity = new(chat1.ChatActivity)
*activity = chat1.NewChatActivityWithIncomingMessage(chat1.IncomingMessage{
Message: utils.PresentMessageUnboxed(ctx, g.G(), decmsg, uid, nm.ConvID),
ModifiedMessage: g.getSupersedesTarget(ctx, uid, conv, decmsg),
ConvID: nm.ConvID,
Conv: g.presentUIItem(ctx, conv, uid),
Message: utils.PresentMessageUnboxed(ctx, g.G(), decmsg, uid, nm.ConvID),
ModifiedMessage: g.getSupersedesTarget(ctx, uid, conv, decmsg),
ConvID: nm.ConvID,
Conv: g.presentUIItem(ctx, conv, uid),
DisplayDesktopNotification: desktopNotification,
DesktopNotificationSnippet: notificationSnippet,
Pagination: utils.PresentPagination(page),
Expand Down
4 changes: 2 additions & 2 deletions go/chat/sender.go
Expand Up @@ -927,9 +927,9 @@ func (s *BlockingSender) Send(ctx context.Context, convID chat1.ConversationID,
activity := chat1.NewChatActivityWithIncomingMessage(chat1.IncomingMessage{
Message: utils.PresentMessageUnboxed(ctx, s.G(), unboxedMsg, boxed.ClientHeader.Sender,
convID),
ConvID: convID,
ConvID: convID,
DisplayDesktopNotification: false,
Conv: s.presentUIItem(convLocal),
Conv: s.presentUIItem(convLocal),
})
s.G().ActivityNotifier.Activity(ctx, boxed.ClientHeader.Sender, conv.GetTopicType(), &activity,
chat1.ChatActivitySource_LOCAL)
Expand Down
12 changes: 6 additions & 6 deletions go/client/chat_cli_rendering.go
Expand Up @@ -68,8 +68,8 @@ func (v conversationInfoListView) show(g *libkb.GlobalContext) error {
})
}
if err := table.Render(ui.OutputWriter(), " ", w, []flexibletable.ColumnConstraint{
5, // visualIndex
8, // vis
5, // visualIndex
8, // vis
flexibletable.ExpandableWrappable, // participants
flexibletable.ExpandableWrappable, // reset
}); err != nil {
Expand Down Expand Up @@ -299,8 +299,8 @@ func (v conversationListView) show(g *libkb.GlobalContext, myUsername string, sh
}

if err := table.Render(ui.OutputWriter(), " ", w, []flexibletable.ColumnConstraint{
5, // visualIndex
1, // unread
5, // visualIndex
1, // unread
flexibletable.ColumnConstraint(w / 5), // convName
flexibletable.ColumnConstraint(w / 5), // authorAndTime
flexibletable.ColumnConstraint(w / 5), // ephemeralInfo
Expand Down Expand Up @@ -393,8 +393,8 @@ func (v conversationView) show(g *libkb.GlobalContext, showDeviceName bool) erro
})
}
if err := table.Render(ui.OutputWriter(), " ", w, []flexibletable.ColumnConstraint{
5, // visualIndex
1, // unread
5, // visualIndex
1, // unread
flexibletable.ColumnConstraint(w / 5), // authorAndTime
flexibletable.ColumnConstraint(w / 5), // ephemeralInfo
flexibletable.ColumnConstraint(w / 5), // reactionInfo
Expand Down
2 changes: 1 addition & 1 deletion go/client/wallet_api_listen_display.go
Expand Up @@ -42,7 +42,7 @@ func newWalletNotificationDisplay(g *libkb.GlobalContext) *walletNotificationDis
}
return &walletNotificationDisplay{
baseNotificationDisplay: newBaseNotificationDisplay(g),
cli: cli,
cli: cli,
}
}

Expand Down
8 changes: 4 additions & 4 deletions go/engine/identify2_test.go
Expand Up @@ -410,7 +410,7 @@ func TestIdentify2WithUIDWithUntrackedFastPath(t *testing.T) {

eng := NewIdentify2WithUID(tc.G, &keybase1.Identify2Arg{Uid: aliceUID, IdentifyBehavior: keybase1.TLFIdentifyBehavior_CHAT_GUI})
eng.testArgs = &Identify2WithUIDTestArgs{
cache: tester,
cache: tester,
allowUntrackedFastPath: true,
}
err := eng.Run(identify2MetaContext(tc, tester))
Expand Down Expand Up @@ -468,9 +468,9 @@ func TestIdentify2WithUIDWithBrokenTrackFromChatGUI(t *testing.T) {
eng := NewIdentify2WithUID(tc.G, &keybase1.Identify2Arg{Uid: tracyUID, IdentifyBehavior: keybase1.TLFIdentifyBehavior_CHAT_GUI})

eng.testArgs = &Identify2WithUIDTestArgs{
noMe: true,
cache: tester,
tcl: importTrackingLink(t, tc.G),
noMe: true,
cache: tester,
tcl: importTrackingLink(t, tc.G),
allowUntrackedFastPath: true,
}

Expand Down
2 changes: 1 addition & 1 deletion go/engine/pgp_keyfinder.go
Expand Up @@ -89,7 +89,7 @@ func (e *PGPKeyfinder) loadKeys(m libkb.MetaContext) {
keys := x.User.GetActivePGPKeys(true)
if len(keys) == 0 {
e.runerr = libkb.NoPGPEncryptionKeyError{
User: x.User.GetName(),
User: x.User.GetName(),
HasKeybaseEncryptionKey: x.User.HasEncryptionSubkey() || (x.User.GetComputedKeyFamily().GetLatestPerUserKey() != nil),
}
return
Expand Down
2 changes: 1 addition & 1 deletion go/engine/saltpack_user_keyfinder.go
Expand Up @@ -29,7 +29,7 @@ func NewSaltpackUserKeyfinderAsInterface(Arg libkb.SaltpackRecipientKeyfinderArg

func NewSaltpackUserKeyfinder(Arg libkb.SaltpackRecipientKeyfinderArg) *SaltpackUserKeyfinder {
return &SaltpackUserKeyfinder{
Arg: Arg,
Arg: Arg,
RecipientEntityKeyMap: make(map[keybase1.UserOrTeamID]([]keybase1.KID)),
RecipientDeviceAndPaperKeyMap: make(map[keybase1.UID]([]keybase1.KID)),
}
Expand Down
4 changes: 2 additions & 2 deletions go/git/get.go
Expand Up @@ -332,8 +332,8 @@ func getMetadataInnerSingle(ctx context.Context, g *libkb.GlobalContext,
CanDelete: responseRepo.Role.IsAdminOrAbove(),
LocalMetadata: localMetadata,
ServerMetadata: keybase1.GitServerMetadata{
Ctime: keybase1.ToTime(responseRepo.CTime),
Mtime: keybase1.ToTime(responseRepo.MTime),
Ctime: keybase1.ToTime(responseRepo.CTime),
Mtime: keybase1.ToTime(responseRepo.MTime),
LastModifyingUsername: lastWriterUPAK.Current.Username,
LastModifyingDeviceID: responseRepo.LastModifyingDeviceID,
LastModifyingDeviceName: deviceName,
Expand Down
12 changes: 6 additions & 6 deletions go/kbfs/kbfssync/leveled_mutex.go
Expand Up @@ -308,8 +308,8 @@ func (m LeveledMutex) AssertLocked(lockState *LockState) {
et := lockState.getExclusionType(m.level)
if et != writeExclusion {
panic(unexpectedExclusionTypeError{
levelToString: lockState.levelToString,
level: m.level,
levelToString: lockState.levelToString,
level: m.level,
expectedExclusionType: writeExclusion,
exclusionType: et,
})
Expand Down Expand Up @@ -391,8 +391,8 @@ func (rw LeveledRWMutex) AssertLocked(lockState *LockState) {
et := lockState.getExclusionType(rw.level)
if et != writeExclusion {
panic(unexpectedExclusionTypeError{
levelToString: lockState.levelToString,
level: rw.level,
levelToString: lockState.levelToString,
level: rw.level,
expectedExclusionType: writeExclusion,
exclusionType: et,
})
Expand All @@ -405,8 +405,8 @@ func (rw LeveledRWMutex) AssertRLocked(lockState *LockState) {
et := lockState.getExclusionType(rw.level)
if et != readExclusion {
panic(unexpectedExclusionTypeError{
levelToString: lockState.levelToString,
level: rw.level,
levelToString: lockState.levelToString,
level: rw.level,
expectedExclusionType: readExclusion,
exclusionType: et,
})
Expand Down
2 changes: 1 addition & 1 deletion go/kbfs/libkbfs/block_ops.go
Expand Up @@ -47,7 +47,7 @@ func NewBlockOpsStandard(
bg := &realBlockGetter{config: config}
qConfig := &realBlockRetrievalConfig{
blockRetrievalPartialConfig: config,
bg: bg,
bg: bg,
}
q := newBlockRetrievalQueue(
queueSize, prefetchQueueSize, throttledPrefetchPeriod, qConfig)
Expand Down
10 changes: 5 additions & 5 deletions go/kbfs/libkbfs/folder_block_manager.go
Expand Up @@ -147,11 +147,11 @@ func newFolderBlockManager(
}

fbm := &folderBlockManager{
appStateUpdater: appStateUpdater,
config: config,
log: log,
shutdownChan: make(chan struct{}),
id: fb.Tlf,
appStateUpdater: appStateUpdater,
config: config,
log: log,
shutdownChan: make(chan struct{}),
id: fb.Tlf,
numPointersPerGCThreshold: numPointersPerGCThresholdDefault,
archiveChan: make(chan ReadOnlyRootMetadata, 500),
archivePauseChan: make(chan (<-chan struct{})),
Expand Down
2 changes: 1 addition & 1 deletion go/kbfs/libkbfs/init.go
Expand Up @@ -228,7 +228,7 @@ func DefaultInitParams(ctx Context) InitParams {
DiskCacheMode: DiskCacheModeLocal,
DiskBlockCacheFraction: 0.10,
SyncBlockCacheFraction: 1.00,
Mode: InitDefaultString,
Mode: InitDefaultString,
}
}

Expand Down
2 changes: 1 addition & 1 deletion go/kbfs/libkbfs/kbfs_ops.go
Expand Up @@ -74,7 +74,7 @@ func NewKBFSOpsStandard(appStateUpdater env.AppStateUpdater, config Config) *KBF
ops: make(map[data.FolderBranch]*folderBranchOps),
opsByFav: make(map[favorites.Folder]*folderBranchOps),
reIdentifyControlChan: make(chan chan<- struct{}),
favs: NewFavorites(config),
favs: NewFavorites(config),
quotaUsage: NewEventuallyConsistentQuotaUsage(
config, quLog, config.MakeVLogger(quLog)),
longOperationDebugDumper: NewImpatientDebugDumper(
Expand Down
4 changes: 2 additions & 2 deletions go/kbfs/libkbfs/ops.go
Expand Up @@ -954,8 +954,8 @@ func (so *syncOp) checkConflict(
}

return &renameUnmergedAction{
fromName: so.getFinalPath().TailName(),
toName: toName,
fromName: so.getFinalPath().TailName(),
toName: toName,
unmergedParentMostRecent: so.getFinalPath().ParentPath().TailPointer(),
mergedParentMostRecent: mergedOp.getFinalPath().ParentPath().
TailPointer(),
Expand Down
1 change: 0 additions & 1 deletion go/libkb/errors.go
Expand Up @@ -2688,7 +2688,6 @@ func (e PushSecretWithoutPasswordError) Error() string {
return e.msg
}


// HumanErrorer is an interface that errors can implement if they want to expose what went wrong to
// humans, either via the CLI or via the electron interface. It sometimes happens that errors get
// wrapped inside of other errors up a stack, and it's hard to know what to show the user.
Expand Down
4 changes: 2 additions & 2 deletions go/libkb/secret_store_upgradeable.go
Expand Up @@ -12,8 +12,8 @@ var _ SecretStoreAll = (*SecretStoreUpgradeable)(nil)

func NewSecretStoreUpgradeable(a, b SecretStoreAll, shouldUpgradeOpportunistically func() bool, shouldStoreInFallback func(*SecretStoreOptions) bool) *SecretStoreUpgradeable {
return &SecretStoreUpgradeable{
a: a,
b: b,
a: a,
b: b,
shouldUpgradeOpportunistically: shouldUpgradeOpportunistically,
shouldStoreInFallback: shouldStoreInFallback,
}
Expand Down
2 changes: 1 addition & 1 deletion go/protocol/chat1/notify.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 23dda21

Please sign in to comment.