Humanize serialization of version vectors (again)

2016-01-20 11:10:22 -08:00
parent e267bf3e09
commit 11d4986517
9 changed files with 38 additions and 17 deletions
--- a/lib/model/rwfolder.go
+++ b/lib/model/rwfolder.go
@@ -87,7 +87,7 @@ type rwFolder struct {
 	ignorePerms    bool
 	copiers        int
 	pullers        int
-	shortID        uint64
+	shortID        protocol.ShortID
 	order          config.PullOrder
 	maxConflicts   int
 	sleep          time.Duration
@@ -108,7 +108,7 @@ type rwFolder struct {
 	errorsMut sync.Mutex
 }

-func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFolder {
+func newRWFolder(m *Model, shortID protocol.ShortID, cfg config.FolderConfiguration) *rwFolder {
 	p := &rwFolder{
 		stateTracker: stateTracker{
 			folder: cfg.ID,