Skip to content

Commit

Permalink
Tidy up creation of VSP clients.
Browse files Browse the repository at this point in the history 
- Remove duplicated param validation.
- Fix error messages (some referred to VSP server or ticketbuyer instead
  of VSP client).
  • Loading branch information
@jholdstock
jholdstock committed Sep 19, 2024
1 parent 4b3ccac commit e79d2e5
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 95 deletions.
134 changes: 39 additions & 95 deletions internal/rpc/rpcserver/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1800,21 +1800,11 @@ func (s *walletServer) PurchaseTickets(ctx context.Context,
}

// new vspd request
var vspHost string
var vspPubKey string
var vspClient *wallet.VSPClient
if req.VspHost != "" || req.VspPubkey != "" {
vspHost = req.VspHost
vspPubKey = req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.Account,
Expand All @@ -1823,7 +1813,7 @@ func (s *walletServer) PurchaseTickets(ctx context.Context,
}
vspClient, err = s.wallet.VSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSP Server instance failed to start: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}
}

Expand Down Expand Up @@ -2608,21 +2598,11 @@ func (t *ticketbuyerServer) RunTicketBuyer(req *pb.RunTicketBuyerRequest, svr pb

// new vspd request
var err error
var vspHost string
var vspPubKey string
var vspClient *wallet.VSPClient
if req.VspHost != "" || req.VspPubkey != "" {
vspHost = req.VspHost
vspPubKey = req.VspPubkey
if vspPubKey == "" {
return status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.Account,
Expand All @@ -2631,7 +2611,7 @@ func (t *ticketbuyerServer) RunTicketBuyer(req *pb.RunTicketBuyerRequest, svr pb
}
vspClient, err = w.VSP(cfg)
if err != nil {
return status.Errorf(codes.Unknown, "TicketBuyer instance failed to start. Error: %v", err)
return status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}
}
if req.BalanceToMaintain < 0 {
Expand Down Expand Up @@ -4092,27 +4072,18 @@ func (s *walletServer) SyncVSPFailedTickets(ctx context.Context, req *pb.SyncVSP
return nil, err
}

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.Account,
ChangeAcct: req.ChangeAccount,
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
Policy: policy,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.Account,
ChangeAcct: req.ChangeAccount,
},
}
vspClient, err := s.wallet.VSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "TicketBuyer instance failed to start. Error: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}

// Process tickets fee if needed.
Expand All @@ -4138,27 +4109,18 @@ func (s *walletServer) SyncVSPFailedTickets(ctx context.Context, req *pb.SyncVSP
func (s *walletServer) ProcessManagedTickets(ctx context.Context, req *pb.ProcessManagedTicketsRequest) (
*pb.ProcessManagedTicketsResponse, error) {

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
Policy: policy,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
},
}
vspClient, err := s.wallet.VSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSPClient instance failed to start. Error: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}

tickets, err := s.wallet.ProcessedTickets(ctx)
Expand All @@ -4177,27 +4139,18 @@ func (s *walletServer) ProcessManagedTickets(ctx context.Context, req *pb.Proces
func (s *walletServer) ProcessUnmanagedTickets(ctx context.Context, req *pb.ProcessUnmanagedTicketsRequest) (
*pb.ProcessUnmanagedTicketsResponse, error) {

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
Policy: policy,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
},
}
vspClient, err := s.wallet.VSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSPClient instance failed to start. Error: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}

unmanagedTickets, err := s.wallet.UnprocessedTickets(ctx)
Expand All @@ -4213,27 +4166,18 @@ func (s *walletServer) ProcessUnmanagedTickets(ctx context.Context, req *pb.Proc
func (s *walletServer) SetVspdVoteChoices(ctx context.Context, req *pb.SetVspdVoteChoicesRequest) (
*pb.SetVspdVoteChoicesResponse, error) {

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
}
cfg := wallet.VSPClientConfig{
URL: vspHost,
PubKey: vspPubKey,
Policy: policy,
URL: req.VspHost,
PubKey: req.VspPubkey,
Policy: &wallet.VSPPolicy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
},
}
vspClient, err := s.wallet.VSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSPClient instance failed to start. Error: %v", err)
return nil, status.Errorf(codes.InvalidArgument, "VSP client failed to start. Error: %v", err)
}

treasuryChoices := make(map[string]string)
Expand Down Expand Up @@ -4276,7 +4220,7 @@ func (s *walletServer) SetVspdVoteChoices(ctx context.Context, req *pb.SetVspdVo
if err != nil {
return err
}
if ticketHost == vspHost {
if ticketHost == req.VspHost {
ticket, err := s.wallet.NewVSPTicket(ctx, hash)
if err != nil {
return err
Expand Down
8 changes: 8 additions & 0 deletions wallet/vsp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ type VSPClientConfig struct {
}

func (w *Wallet) NewVSPClient(cfg VSPClientConfig, log slog.Logger, dialer DialFunc) (*VSPClient, error) {
if cfg.URL == "" {
return nil, errors.New("vsp url can not be null")
}

if cfg.PubKey == "" {
return nil, errors.New("vsp pubkey can not be null")
}

u, err := url.Parse(cfg.URL)
if err != nil {
return nil, err
Expand Down

0 comments on commit e79d2e5

Please sign in to comment.