diff --git a/cmix/interface.go b/cmix/interface.go index 863530bffb9e2ae583c1375cc78f0825a2907188..c03dc1296249a8174916e87f7de2836bd1c7d39f 100644 --- a/cmix/interface.go +++ b/cmix/interface.go @@ -299,5 +299,5 @@ type ClientErrorReport func(source, message, trace string) type clientCommsInterface interface { followNetworkComms SendCmixCommsInterface - nodes.registerNodeCommsInterface + nodes.RegisterNodeCommsInterface } diff --git a/cmix/nodes/interfaces.go b/cmix/nodes/interfaces.go index 34824da338670ea9a40848d71518d9819a3bbda8..ba5809881cf9a7cddc658176b8898eb9f6378bd2 100644 --- a/cmix/nodes/interfaces.go +++ b/cmix/nodes/interfaces.go @@ -62,9 +62,9 @@ type MixCypher interface { MakeClientGatewayAuthMAC(salt, digest []byte) []byte } -// registerNodeCommsInterface is a sub-interface of client.Comms containing +// RegisterNodeCommsInterface is a sub-interface of client.Comms containing // the send function for registering with a cMix node. -type registerNodeCommsInterface interface { +type RegisterNodeCommsInterface interface { SendRequestClientKeyMessage(host *connect.Host, message *pb.SignedClientKeyRequest) (*pb.SignedKeyResponse, error) } diff --git a/cmix/nodes/register.go b/cmix/nodes/register.go index f225cef16fd09b6b8769b4eef5661395acba8787..827e67b2b2f50b3ef5ea33be429fa40e87274300 100644 --- a/cmix/nodes/register.go +++ b/cmix/nodes/register.go @@ -114,7 +114,7 @@ func registerNodes(r *registrar, s session, stop *stoppable.Single, // registerWithNode serves as a helper for registerNodes. It registers a user // with a specific in the client's NDF. -func registerWithNode(sender gateway.Sender, comms registerNodeCommsInterface, +func registerWithNode(sender gateway.Sender, comms RegisterNodeCommsInterface, ngw network.NodeGateway, s session, r *registrar, rng csprng.Source, stop *stoppable.Single) error { diff --git a/cmix/nodes/registrar.go b/cmix/nodes/registrar.go index 1d076e5254f1375788b04d6673ced91734fad0ab..2bfa2cb5df2d982e650658ce15e938d3e31c4624 100644 --- a/cmix/nodes/registrar.go +++ b/cmix/nodes/registrar.go @@ -36,7 +36,7 @@ type registrar struct { session session sender gateway.Sender - comms registerNodeCommsInterface + comms RegisterNodeCommsInterface rng *fastRNG.StreamGenerator c chan network.NodeGateway @@ -45,7 +45,7 @@ type registrar struct { // LoadRegistrar loads a Registrar from disk or creates a new one if it does not // exist. func LoadRegistrar(session session, sender gateway.Sender, - comms registerNodeCommsInterface, rngGen *fastRNG.StreamGenerator, + comms RegisterNodeCommsInterface, rngGen *fastRNG.StreamGenerator, c chan network.NodeGateway) (Registrar, error) { kv := session.GetKV().Prefix(prefix) diff --git a/cmix/nodes/request.go b/cmix/nodes/request.go index a172c28246b8e88d908317c6873b56ebe129f3f1..b75f7801cbb53ed41843a92511a2e89cfafae91f 100644 --- a/cmix/nodes/request.go +++ b/cmix/nodes/request.go @@ -26,7 +26,7 @@ import ( // requestKey is a helper function which constructs a ClientKeyRequest message. // This message is sent to the passed gateway. It will further handle the // request from the gateway. -func requestKey(sender gateway.Sender, comms registerNodeCommsInterface, +func requestKey(sender gateway.Sender, comms RegisterNodeCommsInterface, ngw network.NodeGateway, s session, r *registrar, rng io.Reader, stop *stoppable.Single) (*cyclic.Int, []byte, uint64, error) { diff --git a/cmix/nodes/utils_test.go b/cmix/nodes/utils_test.go index 895999b6faca1976df84da2369d59f77f4a74a9b..5c97dadf3c77bd1309251a23850d3eb252389c93 100644 --- a/cmix/nodes/utils_test.go +++ b/cmix/nodes/utils_test.go @@ -192,7 +192,7 @@ func (m mockSession) GetTransmissionRegistrationValidationSignature() []byte { ///////////////// Mock Comms Interface /////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -// Mock client comms object adhering to registerNodeCommsInterface for testing. +// Mock client comms object adhering to RegisterNodeCommsInterface for testing. type MockClientComms struct { rsaPrivKey *rsa.PrivateKey dhPrivKey *cyclic.Int