diff --git a/broadcast/utils_test.go b/broadcast/utils_test.go index 208e9893e716dc07f66bcdd3fc80ba5c6ed53435..7bd4ac341a47f98359c76c7a06a5adb70f85f05f 100644 --- a/broadcast/utils_test.go +++ b/broadcast/utils_test.go @@ -34,7 +34,7 @@ func newRsaPubKey(seed int64, t *testing.T) *rsa.PublicKey { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/cmix/client.go b/cmix/client.go index a675be8bfef3ceb8086e6a947faaa93c6108781e..92c2d1a1486f1a68c2e2d7672bab34e126cd4a16 100644 --- a/cmix/client.go +++ b/cmix/client.go @@ -140,7 +140,7 @@ func (c *client) Connect(ndf *ndf.NetworkDefinition) error { // Set up gateway.Sender poolParams := gateway.DefaultPoolParams() - // Cmix will not send KeepAlive packets + // Disable KeepAlive packets poolParams.HostParams.KaClientOpts.Time = time.Duration(math.MaxInt64) // Enable optimized HostPool initialization diff --git a/cmix/follow.go b/cmix/follow.go index 608202814b93daa71c727a52aa350b2a010cec1c..29eb9035a252a00b3af8cc80a0768b54d8e528b1 100644 --- a/cmix/follow.go +++ b/cmix/follow.go @@ -224,7 +224,7 @@ func (c *client) follow(report ClientErrorReport, rng csprng.Source, marshaledTid := c.session.GetTransmissionID().Marshal() for _, clientErr := range update.ClientErrors { - // If this Cmix appears in the ClientError + // If this ClientId appears in the ClientError if bytes.Equal(clientErr.ClientId, marshaledTid) { // Obtain relevant NodeGateway information diff --git a/cmix/gateway/hostPool.go b/cmix/gateway/hostPool.go index d5f3164505c31b4dc462c27e7310a13c7517c177..33bf7e9837fd51a9fa059cd3ddef7ae11158ced1 100644 --- a/cmix/gateway/hostPool.go +++ b/cmix/gateway/hostPool.go @@ -66,7 +66,7 @@ type HostManager interface { // accepted. type Filter func(map[id.ID]int, *ndf.NetworkDefinition) map[id.ID]int -// HostPool Handles providing hosts to the Cmix +// HostPool Handles providing hosts to the client type HostPool struct { hostMap map[id.ID]uint32 // Map key to its index in the slice hostList []*connect.Host // Each index in the slice contains the value diff --git a/cmix/interface.go b/cmix/interface.go index a7489b106a5e87c242e84af39a9b4df46f3bcbad..41e15dd3e981daf718f53f2198d0d708aa525e48 100644 --- a/cmix/interface.go +++ b/cmix/interface.go @@ -212,7 +212,7 @@ type Client interface { /* === Nodes ============================================================ */ /* Keys must be registered with nodes in order to send messages through them. This process is, in general, automatically handled by the Network - Cmix. */ + client. */ // HasNode can be used to determine if a keying relationship exists with a // node. @@ -229,7 +229,7 @@ type Client interface { /* === Rounds =========================================================== */ /* A complete set of round info is not kept on the client, and sometimes the network will need to be queried to get round info. Historical rounds - is the system internal to the Network Cmix to do this. It can be used + is the system internal to the Network client to do this. It can be used externally as well. */ // GetRoundResults adjudicates on the rounds requested. Checks if they are diff --git a/cmix/nodes/utils_test.go b/cmix/nodes/utils_test.go index a56c7e45b90f825265663fea8048f6d972e033bf..5370705a4a72e11638a98b5f54d7aaa15800f9d5 100644 --- a/cmix/nodes/utils_test.go +++ b/cmix/nodes/utils_test.go @@ -234,7 +234,7 @@ func (m *MockClientComms) SendRequestClientKeyMessage(_ *connect.Host, // Extract RSA pubkey clientRsaPub := clientTransmissionConfirmation.RSAPubKey - // Assemble Cmix public key into rsa.PublicKey + // Assemble client public key into rsa.PublicKey userPublicKey, err := rsa.LoadPublicKeyFromPem([]byte(clientRsaPub)) if err != nil { m.t.Fatalf("Failed to load public key: %+v", err) diff --git a/connect/utils_test.go b/connect/utils_test.go index 5f6ac632101baabd6510a3ca14b9d46492f5f28c..45038764f61017d7caf2403cd629f8c3e821ca39 100644 --- a/connect/utils_test.go +++ b/connect/utils_test.go @@ -187,7 +187,7 @@ func (m mockConnection) Unregister(listenerID receive.ListenerID) { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmix struct { diff --git a/e2e/fpGenerator_test.go b/e2e/fpGenerator_test.go index 4aeb1a68e3c77063c358cab852f580583c16172f..daf82b417700983987618f9c1a1df171ecd1436c 100644 --- a/e2e/fpGenerator_test.go +++ b/e2e/fpGenerator_test.go @@ -98,7 +98,7 @@ func (m mockSessionCypher) Decrypt(format.Message) ([]byte, error) { return ni func (m mockSessionCypher) Use() {} //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockFpgCmix struct { diff --git a/e2e/utils_test.go b/e2e/utils_test.go index 06eec9892c575029c1ba6333e878d64fb11a454e..36bccbe729f8d9f72b650f960d85a81e110575f2 100644 --- a/e2e/utils_test.go +++ b/e2e/utils_test.go @@ -121,7 +121,7 @@ func (m *mockServices) DeleteService( } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go index 3f6567ccaae086ac14c089c1f4d57618f2931c41..0fe87093612f4229ebe8f276c82be74f7a212caf 100644 --- a/fileTransfer/utils_test.go +++ b/fileTransfer/utils_test.go @@ -80,7 +80,7 @@ func RandStringBytes(n int, prng *rand.Rand) string { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/fileTransfer2/connect/utils_test.go b/fileTransfer2/connect/utils_test.go index d669441dac6cbe6b74275863e08154c469c90dbb..bd155a4825642ec6cf629241b10e3a4e1e561523 100644 --- a/fileTransfer2/connect/utils_test.go +++ b/fileTransfer2/connect/utils_test.go @@ -32,7 +32,7 @@ import ( ) //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/fileTransfer2/e2e/utils_test.go b/fileTransfer2/e2e/utils_test.go index a73d911cf15af01676f8bbb2b86fcb231469daa5..b5c57bcc2ed01ba1a8e9d07aa3401569bf23a579 100644 --- a/fileTransfer2/e2e/utils_test.go +++ b/fileTransfer2/e2e/utils_test.go @@ -32,7 +32,7 @@ import ( ) //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/fileTransfer2/groupChat/utils_test.go b/fileTransfer2/groupChat/utils_test.go index 86f744f19d7c6f8f4ae8f90ac021e0909292ea67..087f095dd60b07648840e3c7d38424837be1a8ba 100644 --- a/fileTransfer2/groupChat/utils_test.go +++ b/fileTransfer2/groupChat/utils_test.go @@ -29,7 +29,7 @@ import ( ) //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/fileTransfer2/utils_test.go b/fileTransfer2/utils_test.go index 40c51f5d5d0ec49d715d7c90e1fb3f4e4bc87045..7f2de0eb05a1bf0086cd2050c7794e02386033c7 100644 --- a/fileTransfer2/utils_test.go +++ b/fileTransfer2/utils_test.go @@ -81,7 +81,7 @@ func RandStringBytes(n int, prng *rand.Rand) string { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockCmixHandler struct { diff --git a/registration/permissioning.go b/registration/permissioning.go index 96e84aea7cda5acd6fba712a6e1a203cbc70aa69..cab953a8472df368a6bc7dd72218a5e49796c2c8 100644 --- a/registration/permissioning.go +++ b/registration/permissioning.go @@ -33,7 +33,7 @@ func Init(comms *client.Comms, def *ndf.NetworkDefinition) (*Registration, error //add the registration host to comms hParam := connect.GetDefaultHostParams() hParam.AuthEnabled = false - // Cmix will not send KeepAlive packets + // Do not send KeepAlive packets hParam.KaClientOpts.Time = time.Duration(math.MaxInt64) hParam.MaxRetries = 3 perm.host, err = comms.AddHost(&id.ClientRegistration, def.Registration.ClientRegistrationAddress, diff --git a/single/listener_test.go b/single/listener_test.go index b5777cec7ec257ab14636099ce2bec51e50b9e44..b7125f217866dbbefdd9e57757944a828da6f2ab 100644 --- a/single/listener_test.go +++ b/single/listener_test.go @@ -222,7 +222,7 @@ func Test_listener_Stop(t *testing.T) { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockListenCmixHandler struct { diff --git a/single/receivedRequest_test.go b/single/receivedRequest_test.go index 6c35b513b052d3f86b40446377669b734d5365c8..fc7f64f4fc398a5ad3407690d40a269410e1d8c0 100644 --- a/single/receivedRequest_test.go +++ b/single/receivedRequest_test.go @@ -154,7 +154,7 @@ func Test_splitPayload(t *testing.T) { } //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// type mockRequestCmix struct { diff --git a/single/utils_test.go b/single/utils_test.go index bd2ff2ece8551b6370f226827b99c7bb990420cb..66e7f0e6d670bfc0e19e8ef237d4e2277abb43ec 100644 --- a/single/utils_test.go +++ b/single/utils_test.go @@ -23,7 +23,7 @@ import ( ) //////////////////////////////////////////////////////////////////////////////// -// Mock cMix Cmix // +// Mock cMix // //////////////////////////////////////////////////////////////////////////////// // Tests that mockCmix adheres to the Cmix interface. diff --git a/xxdk/cmix.go b/xxdk/cmix.go index b467bda2fdabd8be7c48bc311eb064d2de58795c..6b5444bef2b5d2fad83e5bbe7cdad4b835dbb3d0 100644 --- a/xxdk/cmix.go +++ b/xxdk/cmix.go @@ -237,7 +237,7 @@ func LoadCmix(storageDir string, password []byte, parameters Params) (*Cmix, err if def.Notification.Address != "" { hp := connect.GetDefaultHostParams() - // Cmix will not send KeepAlive packets + // Do not send KeepAlive packets hp.KaClientOpts.Time = time.Duration(math.MaxInt64) hp.AuthEnabled = false hp.MaxRetries = 5