Fix order of resultmapper arguments

Author: rdegnan

RSocket.Rpc.Core/RSocket.Rpc.Core.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RSocket.Core" Version="0.2.1" />
+    <PackageReference Include="RSocket.Core" Version="0.2.3" />
     <PackageReference Include="System.IO.Pipelines" Version="4.5.3" />
   </ItemGroup>
 

RSocket.Rpc.Core/RSocketService.cs

@@ -44,7 +44,7 @@ protected Task<TResult> __RequestResponse<TMessage, TResult>(TMessage message, F
 			=> __RequestResponse(_ => resultmapper(_.data), messagemapper(message), metadata, tracing, service: service, method: method);
 
 		private protected Task<T> __RequestResponse<T>(
-			Func<(ReadOnlySequence<byte> metadata, ReadOnlySequence<byte> data), T> resultmapper,
+			Func<(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata), T> resultmapper,
 			ReadOnlySequence<byte> data = default, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default)
 			=> Socket.RequestResponse(resultmapper, data, new RemoteProcedureCallMetadata(service, method, metadata, tracing));
 
@@ -60,7 +60,7 @@ protected IAsyncEnumerable<TResult> __RequestStream<TMessage, TResult>(TMessage
 			=> __RequestStream(result => resultmapper(result.data), sourcemapper(message), metadata, tracing, service: service, method: method);
 
 		private protected IAsyncEnumerable<T> __RequestStream<T>(
-			Func<(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata), T> resultmapper,		//TODO This was out of order, check others!
+			Func<(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata), T> resultmapper,
 			ReadOnlySequence<byte> data = default, ReadOnlySequence<byte> metadata = default,
 			ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default)
 		=> Socket.RequestStream(resultmapper, data, new RemoteProcedureCallMetadata(service, method, metadata, tracing));
@@ -77,7 +77,7 @@ protected IAsyncEnumerable<TResult> __RequestChannel<TMessage, TResult>(IAsyncEn
 			=> __RequestChannel<TMessage, TResult>(messages, message => sourcemapper(message), result => resultmapper(result.data), data, metadata, tracing, service: service, method: method);
 
 		private protected IAsyncEnumerable<T> __RequestChannel<TMessage, T>(IAsyncEnumerable<TMessage> source,
-			Func<TMessage, ReadOnlySequence<byte>> sourcemapper, Func<(ReadOnlySequence<byte> metadata, ReadOnlySequence<byte> data), T> resultmapper,
+			Func<TMessage, ReadOnlySequence<byte>> sourcemapper, Func<(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata), T> resultmapper,
 			ReadOnlySequence<byte> data = default, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default)
 			=> Socket.RequestChannel<TMessage, T>(source, sourcemapper, resultmapper, data, new RemoteProcedureCallMetadata(service, method, metadata, tracing));
 

RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj

@@ -24,7 +24,7 @@
     <Otherwise>
       <ItemGroup>
         <PackageReference Include="Google.Protobuf" Version="3.6.1" />
-        <PackageReference Include="RSocket.Rpc.Tools" Version="0.2.5">
+        <PackageReference Include="RSocket.Rpc.Tools" Version="0.2.9">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>