Skip to content
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.

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

travis: check go1.13 #153

Merged
merged 1 commit into from
Sep 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: go
go:
- 1.12.x
- 1.13.x
sudo: false
install:
- go get -v github.com/golangci/golangci-lint/cmd/golangci-lint
Expand Down
1 change: 0 additions & 1 deletion inidb/inidb.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func New(filename string, create bool, depth int) (*INIDB, error) {
return nil, fmt.Errorf("could not create directory: %v",
err)
}

} else if err != nil {
return nil, fmt.Errorf("could not create lock %v: %v",
path.Dir(filename), err)
Expand Down
1 change: 0 additions & 1 deletion ratchet/ratchet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ func reinitRatchet(t *testing.T, r *Ratchet) *Ratchet {
}

return newR

}

func testScript(t *testing.T, script []scriptAction) {
Expand Down
3 changes: 1 addition & 2 deletions tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func Fingerprint(blob []byte) string {
d := sha256.New()
d.Write(blob)
digest := d.Sum(nil)
return hex.EncodeToString(digest[:])
return hex.EncodeToString(digest)
}

func FingerprintDER(c tls.Certificate) string {
Expand All @@ -92,5 +92,4 @@ func InFours(x string) (string, error) {
x[4:8],
x[8:12],
x[12:16]), nil

}
4 changes: 1 addition & 3 deletions zkclient/identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ func (z *ZKC) ratchetExists(id [zkidentity.IdentitySize]byte) bool {
return err == nil
}

func (z *ZKC) removeRatchet(id [zkidentity.IdentitySize]byte,
half bool) error {

func (z *ZKC) removeRatchet(id [zkidentity.IdentitySize]byte, half bool) error {
var rf string
if half {
rf = halfRatchetFilename
Expand Down
2 changes: 0 additions & 2 deletions zkclient/msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ func (z *ZKC) queueDepth() (*queueDepth, error) {
}

func (z *ZKC) scheduleCRPCCB(hi bool, id *[zkidentity.IdentitySize]byte, payload interface{}, f func()) {

m := wireMsg{
id: id,
payload: payload,
Expand All @@ -222,7 +221,6 @@ func (z *ZKC) scheduleCRPCCB(hi bool, id *[zkidentity.IdentitySize]byte, payload
}

func (z *ZKC) scheduleCRPC(hi bool, id *[zkidentity.IdentitySize]byte, payload interface{}) {

m := wireMsg{
id: id,
payload: payload,
Expand Down
1 change: 0 additions & 1 deletion zkclient/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,6 @@ func (z *ZKC) handleGroupMessage(msg rpc.Message, p rpc.Push,
s = gm.Message[:x] + MAGENTABOLD +
gm.Message[x:x+len(z.id.Public.Nick)] + RESET +
gm.Message[x+len(z.id.Public.Nick):]

}

var n string
Expand Down
1 change: 0 additions & 1 deletion zkserver/rendezvous.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,5 +213,4 @@ bad:
reply.Payload = payload
writer <- &reply
return nil

}
1 change: 0 additions & 1 deletion zkserver/zkserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@ func (z *ZKS) handleSession(kx *session.KX) error {

default:
return fmt.Errorf("invalid message: %v", message)

}

tagBitmap[message.Tag] = false
Expand Down