service: change stop interface (#7816)

privval/signer_client.go

@@ -41,12 +41,12 @@ func NewSignerClient(ctx context.Context, endpoint *SignerListenerEndpoint, chai
 
 // Close closes the underlying connection
 func (sc *SignerClient) Close() error {
-	err := sc.endpoint.Stop()
-	cerr := sc.endpoint.Close()
+	sc.endpoint.Stop()
+	err := sc.endpoint.Close()
 	if err != nil {
 		return err
 	}
-	return cerr
+	return nil
 }
 
 // IsConnected indicates with the signer is connected to a remote signing service

privval/signer_client_test.go

@@ -81,7 +81,7 @@ func TestSignerClose(t *testing.T) {
 			}()
 
 			assert.NoError(t, tc.signerClient.Close())
-			assert.NoError(t, tc.signerServer.Stop())
+			tc.signerServer.Stop()
 		})
 	}
 }

privval/signer_listener_endpoint_test.go

@@ -125,9 +125,7 @@ func TestRetryConnToRemoteSigner(t *testing.T) {
 		t.Cleanup(signerServer.Wait)
 
 		<-endpointIsOpenCh
-		if err := signerServer.Stop(); err != nil {
-			t.Error(err)
-		}
+		signerServer.Stop()
 
 		dialerEndpoint2 := NewSignerDialerEndpoint(
 			logger,
@@ -138,8 +136,8 @@ func TestRetryConnToRemoteSigner(t *testing.T) {
 		// let some pings pass
 		require.NoError(t, signerServer2.Start(ctx))
 		assert.True(t, signerServer2.IsRunning())
+		t.Cleanup(signerServer2.Stop)
 		t.Cleanup(signerServer2.Wait)
-		t.Cleanup(func() { _ = signerServer2.Stop() })
 
 		// give the client some time to re-establish the conn to the remote signer
 		// should see sth like this in the logs: