Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vsp changes #1840

Merged
merged 5 commits into from
Sep 23, 2020
Merged

Vsp changes #1840

merged 5 commits into from
Sep 23, 2020

Conversation

vctt94
Copy link
Member

@vctt94 vctt94 commented Sep 11, 2020

On this PR I am spliting changes which are related to vsp from #1819 to this PR.

I will rebase #1819 to keep only changes related to db.

@@ -2440,6 +2440,8 @@ func (t *ticketbuyerV2Server) RunTicketBuyer(req *pb.RunTicketBuyerRequest, svr
// new vspd request
var vspHost string
var vspPubKey string
var vspServer *vsp.VSP
isVspdReq := false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove isVspdReq, and just use if vspServer != nil

@vctt94 vctt94 force-pushed the vsp-changes branch 7 times, most recently from 1eba0c9 to 2fe6894 Compare September 14, 2020 15:09
vsp/vsp.go Outdated
@@ -126,7 +126,7 @@ func New(hostname, pubKeyStr string, purchaseAccount, changeAccount uint32, dial
log.Infof("VSP has successfully confirmed the fee tx for %v", txHash)
case "error":
log.Warnf("VSP failed to broadcast feetx for %v -- restarting process", txHash)
v.Queue(ctx, *txHash, nil)
v.Queue(ctx, *txHash, feeTx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is wrong; this will retry with the same feeTx. The nil retries by generating a new feetx.

@vctt94 vctt94 force-pushed the vsp-changes branch 3 times, most recently from 0fb7201 to 5c7f83d Compare September 16, 2020 17:26
@vctt94 vctt94 requested a review from dajohi September 18, 2020 10:35
@jrick jrick merged commit 415df74 into decred:master Sep 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants