Skip to content

Commit

Permalink
vsp: Don't export Wallet.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jholdstock @jrick
jholdstock authored and jrick committed Apr 24, 2023
1 parent 6cc8d05 commit bf8e7a0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
24 changes: 12 additions & 12 deletions internal/vsp/feepayment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ func parseTicket(ticket *wire.MsgTx, params *chaincfg.Params) (
func (fp *feePayment) ticketSpent() bool {
ctx := fp.ctx
ticketOut := wire.OutPoint{Hash: fp.ticketHash, Index: 0, Tree: 1}
_, _, err := fp.client.Wallet.Spender(ctx, &ticketOut)
_, _, err := fp.client.wallet.Spender(ctx, &ticketOut)
return err == nil
}

func (fp *feePayment) ticketExpired() bool {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet
_, tipHeight := w.MainChainTip(ctx)

fp.mu.Lock()
Expand Down Expand Up @@ -208,7 +208,7 @@ func (c *Client) feePayment(ctx context.Context, ticketHash *chainhash.Hash, pol
}
}()

w := c.Wallet
w := c.wallet
params := w.ChainParams()

fp = &feePayment{
Expand Down Expand Up @@ -293,7 +293,7 @@ func (c *Client) feePayment(ctx context.Context, ticketHash *chainhash.Hash, pol
}

func (c *Client) tx(ctx context.Context, hash *chainhash.Hash) (*wire.MsgTx, error) {
txs, _, err := c.Wallet.GetTransactionsByHashes(ctx, []*chainhash.Hash{hash})
txs, _, err := c.wallet.GetTransactionsByHashes(ctx, []*chainhash.Hash{hash})
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -321,7 +321,7 @@ func (fp *feePayment) schedule(name string, method func() error) {
}

func (fp *feePayment) next() time.Duration {
w := fp.client.Wallet
w := fp.client.wallet
params := w.ChainParams()
_, tipHeight := w.MainChainTip(fp.ctx)

Expand Down Expand Up @@ -368,7 +368,7 @@ func (fp *feePayment) stop() {

func (fp *feePayment) receiveFeeAddress() error {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet
params := w.ChainParams()

// stop processing if ticket is expired or spent
Expand Down Expand Up @@ -441,7 +441,7 @@ func (fp *feePayment) receiveFeeAddress() error {
// be dereferenced.
func (fp *feePayment) makeFeeTx(tx *wire.MsgTx) error {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet

fp.mu.Lock()
fee := fp.fee
Expand Down Expand Up @@ -594,7 +594,7 @@ func (fp *feePayment) makeFeeTx(tx *wire.MsgTx) error {
}

func (c *Client) status(ctx context.Context, ticketHash *chainhash.Hash) (*types.TicketStatusResponse, error) {
w := c.Wallet
w := c.wallet
params := w.ChainParams()

ticketTx, err := c.tx(ctx, ticketHash)
Expand Down Expand Up @@ -630,7 +630,7 @@ func (c *Client) status(ctx context.Context, ticketHash *chainhash.Hash) (*types

func (c *Client) setVoteChoices(ctx context.Context, ticketHash *chainhash.Hash,
choices []wallet.AgendaChoice, tspendPolicy map[string]string, treasuryPolicy map[string]string) error {
w := c.Wallet
w := c.wallet
params := w.ChainParams()

ticketTx, err := c.tx(ctx, ticketHash)
Expand Down Expand Up @@ -678,7 +678,7 @@ func (c *Client) setVoteChoices(ctx context.Context, ticketHash *chainhash.Hash,

func (fp *feePayment) reconcilePayment() error {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet

// stop processing if ticket is expired or spent
// XXX if ticket is no longer saved by wallet (because the tx expired,
Expand Down Expand Up @@ -788,7 +788,7 @@ func (fp *feePayment) reconcilePayment() error {

func (fp *feePayment) submitPayment() (err error) {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet

// stop processing if ticket is expired or spent
if fp.removedExpiredOrSpent() {
Expand Down Expand Up @@ -869,7 +869,7 @@ func (fp *feePayment) submitPayment() (err error) {

func (fp *feePayment) confirmPayment() (err error) {
ctx := fp.ctx
w := fp.client.Wallet
w := fp.client.wallet

// stop processing if ticket is expired or spent
if fp.removedExpiredOrSpent() {
Expand Down
26 changes: 13 additions & 13 deletions internal/vsp/vsp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Policy struct {
}

type Client struct {
Wallet *wallet.Wallet
wallet *wallet.Wallet
Policy Policy
*vspd.Client

Expand Down Expand Up @@ -78,7 +78,7 @@ func New(cfg Config) (*Client, error) {
}

v := &Client{
Wallet: cfg.Wallet,
wallet: cfg.Wallet,
Policy: cfg.Policy,
Client: client,
jobs: make(map[chainhash.Hash]*feePayment),
Expand All @@ -98,14 +98,14 @@ func (c *Client) FeePercentage(ctx context.Context) (float64, error) {
// any association with a VSP.
func (c *Client) ProcessUnprocessedTickets(ctx context.Context, policy Policy) {
var wg sync.WaitGroup
c.Wallet.ForUnspentUnexpiredTickets(ctx, func(hash *chainhash.Hash) error {
c.wallet.ForUnspentUnexpiredTickets(ctx, func(hash *chainhash.Hash) error {
// Skip tickets which have a fee tx already associated with
// them; they are already processed by some vsp.
_, err := c.Wallet.VSPFeeHashForTicket(ctx, hash)
_, err := c.wallet.VSPFeeHashForTicket(ctx, hash)
if err == nil {
return nil
}
confirmed, err := c.Wallet.IsVSPTicketConfirmed(ctx, hash)
confirmed, err := c.wallet.IsVSPTicketConfirmed(ctx, hash)
if err != nil && !errors.Is(err, errors.NotExist) {
log.Error(err)
return nil
Expand Down Expand Up @@ -152,9 +152,9 @@ func (c *Client) ProcessTicket(ctx context.Context, hash *chainhash.Hash) error
// tracking after seed restores, and is only performed on unspent and unexpired
// tickets.
func (c *Client) ProcessManagedTickets(ctx context.Context, policy Policy) error {
err := c.Wallet.ForUnspentUnexpiredTickets(ctx, func(hash *chainhash.Hash) error {
err := c.wallet.ForUnspentUnexpiredTickets(ctx, func(hash *chainhash.Hash) error {
// We only want to process tickets that haven't been confirmed yet.
confirmed, err := c.Wallet.IsVSPTicketConfirmed(ctx, hash)
confirmed, err := c.wallet.IsVSPTicketConfirmed(ctx, hash)
if err != nil && !errors.Is(err, errors.NotExist) {
log.Error(err)
return nil
Expand Down Expand Up @@ -186,7 +186,7 @@ func (c *Client) ProcessManagedTickets(ctx context.Context, policy Policy) error
if err != nil {
return err
}
err = c.Wallet.UpdateVspTicketFeeToConfirmed(ctx, hash, feeHash, c.Client.URL, c.Client.PubKey)
err = c.wallet.UpdateVspTicketFeeToConfirmed(ctx, hash, feeHash, c.Client.URL, c.Client.PubKey)
if err != nil {
return err
}
Expand All @@ -196,7 +196,7 @@ func (c *Client) ProcessManagedTickets(ctx context.Context, policy Policy) error
if err != nil {
return err
}
err = c.Wallet.UpdateVspTicketFeeToPaid(ctx, hash, feeHash, c.Client.URL, c.Client.PubKey)
err = c.wallet.UpdateVspTicketFeeToPaid(ctx, hash, feeHash, c.Client.URL, c.Client.PubKey)
if err != nil {
return err
}
Expand Down Expand Up @@ -228,7 +228,7 @@ func (c *Client) Process(ctx context.Context, ticketHash *chainhash.Hash, feeTx
func (c *Client) ProcessWithPolicy(ctx context.Context, ticketHash *chainhash.Hash, feeTx *wire.MsgTx,
policy Policy) error {

vspTicket, err := c.Wallet.VSPTicketInfo(ctx, ticketHash)
vspTicket, err := c.wallet.VSPTicketInfo(ctx, ticketHash)
if err != nil && !errors.Is(err, errors.NotExist) {
return err
}
Expand All @@ -243,7 +243,7 @@ func (c *Client) ProcessWithPolicy(ctx context.Context, ticketHash *chainhash.Ha
// transaction, submit it then confirm.
fp := c.feePayment(ctx, ticketHash, policy, false)
if fp == nil {
err := c.Wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
err := c.wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
if err != nil {
return err
}
Expand All @@ -256,7 +256,7 @@ func (c *Client) ProcessWithPolicy(ctx context.Context, ticketHash *chainhash.Ha
fp.mu.Unlock()
err := fp.receiveFeeAddress()
if err != nil {
err := c.Wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
err := c.wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
if err != nil {
return err
}
Expand All @@ -267,7 +267,7 @@ func (c *Client) ProcessWithPolicy(ctx context.Context, ticketHash *chainhash.Ha
}
err = fp.makeFeeTx(feeTx)
if err != nil {
err := c.Wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
err := c.wallet.UpdateVspTicketFeeToErrored(ctx, ticketHash, c.Client.URL, c.Client.PubKey)
if err != nil {
return err
}
Expand Down

0 comments on commit bf8e7a0

Please sign in to comment.