@@ -170,22 +170,22 @@ type RedeemTicket struct {
170170 RecipientRand * big.Int
171171}
172172
173- func (c PaymentChain ) PrepareRedemption (ctx context.Context , key * Key , chainID * big.Int , t RedeemTicket ) (SignedTransaction , error ) {
174- return c .prepareRedemption (ctx , key , chainID , t , nil )
173+ func (c PaymentChain ) PrepareRedemption (ctx context.Context , redeemer * Key , chainID * big.Int , t RedeemTicket ) (SignedTransaction , error ) {
174+ return c .prepareRedemption (ctx , redeemer , chainID , t , nil )
175175}
176176
177177// PrepareRedemptionAndStore reserves the nonce only after the caller saves the
178178// signed redemption identity, before any possible broadcast.
179- func (c PaymentChain ) PrepareRedemptionAndStore (ctx context.Context , key * Key , chainID * big.Int , t RedeemTicket , save func (SignedTransaction ) error ) (SignedTransaction , error ) {
179+ func (c PaymentChain ) PrepareRedemptionAndStore (ctx context.Context , redeemer * Key , chainID * big.Int , t RedeemTicket , save func (SignedTransaction ) error ) (SignedTransaction , error ) {
180180 if save == nil {
181181 return SignedTransaction {}, errors .New ("transaction persistence is required" )
182182 }
183- return c .prepareRedemption (ctx , key , chainID , t , save )
183+ return c .prepareRedemption (ctx , redeemer , chainID , t , save )
184184}
185185
186- func (c PaymentChain ) prepareRedemption (ctx context.Context , key * Key , chainID * big.Int , t RedeemTicket , save func (SignedTransaction ) error ) (SignedTransaction , error ) {
187- if key == nil || key .Address () != t .Recipient || t .FaceValue == nil || t .WinProb == nil || t .RecipientRand == nil {
188- return SignedTransaction {}, errors .New ("redemption recipient key mismatch " )
186+ func (c PaymentChain ) prepareRedemption (ctx context.Context , redeemer * Key , chainID * big.Int , t RedeemTicket , save func (SignedTransaction ) error ) (SignedTransaction , error ) {
187+ if redeemer == nil || redeemer .Address () != t .Recipient || t .FaceValue == nil || t .WinProb == nil || t .RecipientRand == nil {
188+ return SignedTransaction {}, errors .New ("redeemer account does not match ticket recipient " )
189189 }
190190 address , err := c .Contracts .Resolve (ctx , "ticketBroker" )
191191 if err != nil {
@@ -196,18 +196,18 @@ func (c PaymentChain) prepareRedemption(ctx context.Context, key *Key, chainID *
196196 if err != nil {
197197 return SignedTransaction {}, err
198198 }
199- plan , err := c .Contracts .PlanTransaction (ctx , key .Address (), address , data , big .NewInt (0 ))
199+ plan , err := c .Contracts .PlanTransaction (ctx , redeemer .Address (), address , data , big .NewInt (0 ))
200200 if err != nil {
201201 return SignedTransaction {}, err
202202 }
203203 if save != nil {
204- return c .Contracts .PrepareAndStore (ctx , plan , key , chainID , save )
204+ return c .Contracts .PrepareAndStore (ctx , plan , redeemer , chainID , save )
205205 }
206- return c .Contracts .Prepare (ctx , plan , key , chainID )
206+ return c .Contracts .Prepare (ctx , plan , redeemer , chainID )
207207}
208208
209- func (c PaymentChain ) Redeem (ctx context.Context , key * Key , chainID * big.Int , t RedeemTicket ) (ethcommon.Hash , error ) {
210- tx , err := c .PrepareRedemption (ctx , key , chainID , t )
209+ func (c PaymentChain ) Redeem (ctx context.Context , redeemer * Key , chainID * big.Int , t RedeemTicket ) (ethcommon.Hash , error ) {
210+ tx , err := c .PrepareRedemption (ctx , redeemer , chainID , t )
211211 if err != nil {
212212 return ethcommon.Hash {}, err
213213 }
0 commit comments