@@ -144,33 +144,25 @@ contract RailSettlementHelpers is Test {
144144 console.log ("payeeFundsBefore " , payeeAccountBefore.funds);
145145 console.log ("payeeLockupBefore " , payeeAccountBefore.lockupCurrent);
146146
147- uint256 settlementAmount;
148- uint256 netPayeeAmount;
149- uint256 paymentFee;
150- uint256 operatorCommission;
151- uint64 settledUpto;
152- string memory note;
153-
154147 vm.startPrank (payer);
155- (settlementAmount, netPayeeAmount, paymentFee, operatorCommission, settledUpto, note) = payments
156- .settleRail (railId, untilEpoch);
148+ (result.totalAmount, result.netPayeeAmount, result.paymentFee, result.operatorCommission, result.settledUpto, result.note) = payments.settleRail (railId, untilEpoch);
157149 vm.stopPrank ();
158150
159- console.log ("settlementAmount " , settlementAmount );
160- console.log ("netPayeeAmount " , netPayeeAmount);
161- console.log ("paymentFee " , paymentFee);
162- console.log ("operatorCommission " , operatorCommission);
163- console.log ("settledUpto " , settledUpto);
164- console.log ("note " , note);
151+ console.log ("settlementAmount " , result.totalAmount );
152+ console.log ("netPayeeAmount " , result. netPayeeAmount);
153+ console.log ("paymentFee " , result. paymentFee);
154+ console.log ("operatorCommission " , result. operatorCommission);
155+ console.log ("settledUpto " , result. settledUpto);
156+ console.log ("note " , result. note);
165157
166158 // Verify results
167159 assertEq (
168- settlementAmount ,
160+ result.totalAmount ,
169161 expectedAmount,
170162 "Settlement amount doesn't match expected "
171163 );
172164 assertEq (
173- settledUpto,
165+ result. settledUpto,
174166 expectedUpto,
175167 "Settled upto doesn't match expected "
176168 );
@@ -183,19 +175,17 @@ contract RailSettlementHelpers is Test {
183175
184176 assertEq (
185177 payerAccountBefore.funds - payerAccountAfter.funds,
186- settlementAmount ,
178+ result.totalAmount ,
187179 "Payer's balance reduction doesn't match settlement amount "
188180 );
189181 assertEq (
190182 payeeAccountAfter.funds - payeeAccountBefore.funds,
191- netPayeeAmount,
183+ result. netPayeeAmount,
192184 "Payee's balance increase doesn't match net payee amount "
193185 );
194186
195187 rail = payments.getRail (railId);
196188 assertEq (rail.settledUpTo, expectedUpto, "Rail settled upto incorrect " );
197-
198- return SettlementResult (settlementAmount, netPayeeAmount, paymentFee, operatorCommission, settledUpto, note);
199189 }
200190
201191 function terminateAndSettleRail (
0 commit comments