mixclient: remove expiry from message interface

mixing/mixclient/client.go

@@ -784,12 +784,12 @@ func (c *Client) run(ps *pairedSessions, expiry uint32, d *deadlines) error {
 		for i := range p.srMsg {
 			srMsgBytes[i] = p.srMsg[i].Bytes()
 		}
-		rs := wire.NewMsgMixSecrets(*p.id, sesRun.sid, expiry, run,
+		rs := wire.NewMsgMixSecrets(*p.id, sesRun.sid, run,
 			*p.prngSeed, srMsgBytes, p.dcMsg)
 		commitment := rs.Hash()
 		ecdhPub := *(*[33]byte)(p.kx.ECDHPublicKey.SerializeCompressed())
 		pqPub := *p.kx.PQPublicKey
-		ke := wire.NewMsgMixKeyExchange(*p.id, sesRun.sid, expiry, run,
+		ke := wire.NewMsgMixKeyExchange(*p.id, sesRun.sid, run,
 			ecdhPub, pqPub, commitment, seenPRs)
 
 		p.ke = ke
@@ -908,7 +908,7 @@ builtSession:
 		for i := range kes {
 			seenKEs[i] = kes[i].Hash()
 		}
-		ct := wire.NewMsgMixCiphertexts(*p.id, sesRun.sid, expiry, run, pqct, seenKEs)
+		ct := wire.NewMsgMixCiphertexts(*p.id, sesRun.sid, run, pqct, seenKEs)
 		p.ct = ct
 		return p.signAndSubmit(ct)
 	})
@@ -970,7 +970,7 @@ builtSession:
 		for i := range cts {
 			seenCTs[i] = cts[i].Hash()
 		}
-		sr := wire.NewMsgMixSlotReserve(*p.id, sesRun.sid, expiry, run, srMixBytes, seenCTs)
+		sr := wire.NewMsgMixSlotReserve(*p.id, sesRun.sid, run, srMixBytes, seenCTs)
 		p.sr = sr
 		return p.signAndSubmit(sr)
 	})
@@ -1037,7 +1037,7 @@ builtSession:
 		for i := range srs {
 			seenSRs[i] = srs[i].Hash()
 		}
-		dc := wire.NewMsgMixDCNet(*p.id, sesRun.sid, expiry, run, p.dcNet, seenSRs)
+		dc := wire.NewMsgMixDCNet(*p.id, sesRun.sid, run, p.dcNet, seenSRs)
 		p.dc = dc
 		return p.signAndSubmit(dc)
 	})
@@ -1102,7 +1102,7 @@ builtSession:
 		for i := range dcs {
 			seenDCs[i] = dcs[i].Hash()
 		}
-		cm := wire.NewMsgMixConfirm(*p.id, sesRun.sid, expiry, run,
+		cm := wire.NewMsgMixConfirm(*p.id, sesRun.sid, run,
 			p.coinjoin.Tx().Copy(), seenDCs)
 		p.cm = cm
 		return p.signAndSubmit(cm)