diff --git a/api/mockserver.go b/api/mockserver.go index cf62d6f891a6d1d0f39f2e440f1fd2b93f035127..e5324a1b0b8687a6228ea2e9107ff62629489f28 100644 --- a/api/mockserver.go +++ b/api/mockserver.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/api/mockserver_test.go b/api/mockserver_test.go index 12b4ba42410b931fb43a052c8f92c722603f8ab7..d427cc78067108d4677be78238443882cc03365a 100644 --- a/api/mockserver_test.go +++ b/api/mockserver_test.go @@ -54,6 +54,7 @@ func TestMain(m *testing.M) { os.Exit(testMainWrapper(m)) } +//Happy path: test message receiver stating up func TestClient_StartMessageReceiver_MultipleMessages(t *testing.T) { // Initialize client with dummy storage testDef := getNDF() @@ -116,6 +117,9 @@ func TestClient_StartMessageReceiver_MultipleMessages(t *testing.T) { } err = client.StartMessageReceiver(cb) + if err != nil { + t.Errorf("%+v", err) + } time.Sleep(3 * time.Second) for _, gw := range GWErrComms { diff --git a/api/private_test.go b/api/private_test.go index 815c1d73bad795274f9b72ae6ddb34f64ec8300e..514a19a500da8b0c04cfc5d16b6e0a5065590709 100644 --- a/api/private_test.go +++ b/api/private_test.go @@ -1,3 +1,8 @@ +//////////////////////////////////////////////////////////////////////////////// +// Copyright © 2019 Privategrity Corporation / +// / +// All rights reserved. / +//////////////////////////////////////////////////////////////////////////////// package api import ( diff --git a/api/register_test.go b/api/register_test.go index 7c7438c9fe21e2388ce5f260be252bde97cf08a6..b36b0f93c39b0fa4e793f52594730f47ec0a98a1 100644 --- a/api/register_test.go +++ b/api/register_test.go @@ -1,3 +1,8 @@ +//////////////////////////////////////////////////////////////////////////////// +// Copyright © 2019 Privategrity Corporation / +// / +// All rights reserved. / +//////////////////////////////////////////////////////////////////////////////// package api import ( diff --git a/bots/bots_test.go b/bots/bots_test.go index 0497558e26ddb4a6e0a95c32ca2e4db54c6e394b..c6628b29a78cb425298a2c25b60df832a40f9b52 100644 --- a/bots/bots_test.go +++ b/bots/bots_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/cmd/gen.go b/cmd/gen.go index eced66f3f31bb3f7273e13adfaaf90d3036fe2f3..29b0f1b00917f2f23b7f58329a42aaed250a10b4 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/cmd/udb.go b/cmd/udb.go index 178cdd64e383bfa61765e64941e47aae8ef6cc14..a18ffc1c033e3e311c7d95b895062de112df5ef7 100644 --- a/cmd/udb.go +++ b/cmd/udb.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/cmd/version.go b/cmd/version.go index 2d6052a2c334be53b308943921d0bdbbe12be650..0dac058f7eb768199646c92cab48c7bab9dbb512 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/crypto/decrypt.go b/crypto/decrypt.go index 0d2b3a90aa48246985ca93f9ae2babb23955a457..9004d5aa028585d9ff05dd7894f6d9d80041ea32 100644 --- a/crypto/decrypt.go +++ b/crypto/decrypt.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/crypto/encrypt.go b/crypto/encrypt.go index 95a6c12c3da10d689de44cc4274296eb79f213d0..7cfe6fe504820f8943b49507a286e1af567a2ac2 100644 --- a/crypto/encrypt.go +++ b/crypto/encrypt.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/crypto/encryptdecrypt_test.go b/crypto/encryptdecrypt_test.go index 6d511fd42d76216c6ae42d2ae6bbfc85f57ba8a9..b94d74a3d5b720ca85259f8e9eaf1fcbbd3a31c3 100644 --- a/crypto/encryptdecrypt_test.go +++ b/crypto/encryptdecrypt_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/globals/log.go b/globals/log.go index 317b22e301c3874acddf0f4e226528339c5c3a4b..bb092c64074e1cfe5e6a197aa508bfb630c08837 100644 --- a/globals/log.go +++ b/globals/log.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/globals/storage_test.go b/globals/storage_test.go index d1f48943c3c706bbac1296caa7e432f8ab74cf84..23cbf077c49c528a3038b8e5e85cbd5a29f0d9a3 100644 --- a/globals/storage_test.go +++ b/globals/storage_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/globals/terminator.go b/globals/terminator.go index 9e7615c5371f2076512b2c77077a9d57f78aab38..5b17199f2a3d75466da1e17088135d7620d572fe 100644 --- a/globals/terminator.go +++ b/globals/terminator.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/globals/terminator_test.go b/globals/terminator_test.go index 92cb9d601e6bdf9d0845c012048689268a42225a..b43c8cc03cb4e315c945f1e2983c5f85f555bc8c 100644 --- a/globals/terminator_test.go +++ b/globals/terminator_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/go.mod b/go.mod index 7efb04c7031a170f7563df7507129d9525774e39..a47c07c6ca8e301c073ff0d84e4396d25906371d 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/golang/protobuf v1.3.2 github.com/google/go-cmp v0.3.1 // indirect github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de // indirect + github.com/kr/pretty v0.2.0 // indirect github.com/pelletier/go-toml v1.6.0 // indirect github.com/pkg/errors v0.8.1 github.com/smartystreets/assertions v1.0.1 // indirect @@ -19,9 +20,10 @@ require ( gitlab.com/elixxir/comms v0.0.0-20191206003247-33238c377132 gitlab.com/elixxir/crypto v0.0.0-20191121235352-86d305a9b253 gitlab.com/elixxir/primitives v0.0.0-20191204001459-cef5ed720564 - golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 + golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect - golang.org/x/sys v0.0.0-20191220220014-0732a990476f // indirect - google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1 // indirect + golang.org/x/sys v0.0.0-20200103143344-a1369afcdac7 // indirect + google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb // indirect google.golang.org/grpc v1.26.0 // indirect + gopkg.in/ini.v1 v1.51.1 // indirect ) diff --git a/go.sum b/go.sum index 6831cd7605b442077587a41fc31036bf0a6b4cac..b7454ebd3bbda343702667bc37ea5cdb222c2a75 100644 --- a/go.sum +++ b/go.sum @@ -71,6 +71,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -169,8 +171,8 @@ golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f h1:kz4KIr+xcPUsI3VMoqWfPMvtnJ6MGfiVwsWSVzphMO4= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk= -golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90onWEf1dF4C+0hPJCc9Mpc= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -203,8 +205,8 @@ golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49nj golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191118133127-cf1e2d577169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191119195528-f068ffe820e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220220014-0732a990476f h1:72l8qCJ1nGxMGH26QVBVIxKd/D34cfGt0OvrPtpemyY= -golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200103143344-a1369afcdac7 h1:/W9OPMnnpmFXHYkcp2rQsbFUbRlRzfECQjmAFiOyHE8= +golang.org/x/sys v0.0.0-20200103143344-a1369afcdac7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -223,8 +225,8 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11 h1:51D++eCgOHufw5VfDE9Uzqyyc+OyQIjb9hkYy9LN5Fk= google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1 h1:PlscBL5CvF+v1mNR82G+i4kACGq2JQvKDnNq7LSS65o= -google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb h1:ADPHZzpzM4tk4V4S5cnCrr5SwzvlrPRmqqCuJDB8UTs= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -242,6 +244,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/io/collate.go b/io/collate.go index 9ea54c43eb1b1e544e7706e92e7a6cd4ebaf2112..f9781e956633c70493632f938c9760ef57fbfb3a 100644 --- a/io/collate.go +++ b/io/collate.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/main.go b/main.go index bc534f08c0bf421cb68f9d6ff558864bee64448e..a39e9f5c9e113859986a2102f4e9f043698085b4 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/body.go b/parse/body.go index 4bcdb7b73d1a27afe080a4bb37b4a347bd7109f7..165e7c8c4366dc1a4e0cb146e1313b2258e89dc1 100644 --- a/parse/body.go +++ b/parse/body.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/body_test.go b/parse/body_test.go index 7851baf3e33b03afb8ff9660727b528b58fbee1f..fd1e5a67360c2f996f5338cc73bf38c0a6406c2e 100644 --- a/parse/body_test.go +++ b/parse/body_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/message.go b/parse/message.go index 471c836c1959e736ac1acde4ff2d5305f7de21f9..898d7e5e77244eccecfcf7cd96dd803cefeb84df 100644 --- a/parse/message.go +++ b/parse/message.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/message_test.go b/parse/message_test.go index 96eae5aaf030f1b38c299c6b0068399cddd2eefa..92746eff493349b1fa6a4d0c3e252040aeabce91 100644 --- a/parse/message_test.go +++ b/parse/message_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/partition.go b/parse/partition.go index c4ca14bfb77b5a30fb36732b978f3885e89b6ce1..b36c92de67722cfafaf71c7bd967b8c9cb507a0b 100644 --- a/parse/partition.go +++ b/parse/partition.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/parse/partition_test.go b/parse/partition_test.go index 349ad3c75da2cae06d696afdce1d76a4f5f17163..cfd856a57f84f4ff22b6741100e5648b4420a894 100644 --- a/parse/partition_test.go +++ b/parse/partition_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/user/user.go b/user/user.go index 8a1cf8b727aa283fcffd68ebe3675c97dea7528a..deff4cb45ed89793089083e5b819430421cd4104 100644 --- a/user/user.go +++ b/user/user.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / //////////////////////////////////////////////////////////////////////////////// diff --git a/user/user_test.go b/user/user_test.go index 7bd909df0f855a3524c61de2295a9d2de59b35eb..fd2a0cfe78c38c60de115d574128805049495cb4 100644 --- a/user/user_test.go +++ b/user/user_test.go @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright © 2018 Privategrity Corporation / +// Copyright © 2019 Privategrity Corporation / // / // All rights reserved. / ////////////////////////////////////////////////////////////////////////////////