chore: remove superfluous if-statement, fn renaming

relab · Feb 2, 2024 · 93bf061 · 93bf061
1 parent 5710833
commit 93bf061
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/rpc.go b/rpc.go
@@ -25,10 +25,7 @@ func (n *RawNode) RPCCall(ctx context.Context, d CallData) (protoreflect.ProtoMe
 
 	select {
 	case r := <-replyChan:
-		if r.err != nil {
-			return nil, r.err
-		}
-		return r.msg, nil
+		return r.msg, r.err
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	}

diff --git a/rpc_test.go b/rpc_test.go
@@ -18,7 +18,7 @@ func TestRPCCallSuccess(t *testing.T) {
 	})
 	defer teardown()
 
-	mgr := rpcTestMgr()
+	mgr := gorumsTestMgr()
 
 	_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
 	if err != nil {
@@ -44,7 +44,7 @@ func TestRPCCallDownedNode(t *testing.T) {
 	addrs, teardown := gorums.TestSetup(t, 1, func(_ int) gorums.ServerIface {
 		return initServer()
 	})
-	mgr := rpcTestMgr()
+	mgr := gorumsTestMgr()
 
 	_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
 	if err != nil {
@@ -74,7 +74,7 @@ func TestRPCCallTimedOut(t *testing.T) {
 	})
 	defer teardown()
 
-	mgr := rpcTestMgr()
+	mgr := gorumsTestMgr()
 
 	_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
 	if err != nil {
@@ -103,7 +103,7 @@ func initServer() *gorums.Server {
 	return srv
 }
 
-func rpcTestMgr() *dummy.Manager {
+func gorumsTestMgr() *dummy.Manager {
 	mgr := dummy.NewManager(
 		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(