fixup! fixup! multi: enable per-peer premium configuration

ElementsProject · Feb 19, 2025 · e832b4b · e832b4b
1 parent f0283be
commit e832b4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/cmd/peerswaplnd/pscli/main.go b/cmd/peerswaplnd/pscli/main.go
@@ -555,8 +555,8 @@ func getDefaultPremiumRate(ctx *cli.Context) error {
 	defer cleanup()
 
 	res, err := client.GetDefaultPremiumRate(context.Background(), &peerswaprpc.GetDefaultPremiumRateRequest{
-		Asset:     peerswaprpc.AssetType(peerswaprpc.AssetType_value[strings.ToUpper(assetFlag.Name)]),
-		Operation: peerswaprpc.OperationType(peerswaprpc.OperationType_value[strings.ToUpper(operationFlag.Name)]),
+		Asset:     peerswaprpc.AssetType(peerswaprpc.AssetType_value[ctx.String(strings.ToUpper(assetFlag.Name))]),
+		Operation: peerswaprpc.OperationType(peerswaprpc.OperationType_value[ctx.String(strings.ToUpper(operationFlag.Name))]),
 	})
 	if err != nil {
 		return err
@@ -574,8 +574,8 @@ func updateDefaultPremiumRate(ctx *cli.Context) error {
 
 	res, err := client.UpdateDefaultPremiumRate(context.Background(), &peerswaprpc.UpdateDefaultPremiumRateRequest{
 		Rate: &peerswaprpc.PremiumRate{
-			Asset:          peerswaprpc.AssetType(peerswaprpc.AssetType_value[strings.ToUpper(assetFlag.Name)]),
-			Operation:      peerswaprpc.OperationType(peerswaprpc.OperationType_value[strings.ToUpper(operationFlag.Name)]),
+			Asset:          peerswaprpc.AssetType(peerswaprpc.AssetType_value[ctx.String(strings.ToUpper(assetFlag.Name))]),
+			Operation:      peerswaprpc.OperationType(peerswaprpc.OperationType_value[ctx.String(strings.ToUpper(operationFlag.Name))]),
 			PremiumRatePpm: ctx.Int64(rateFlag.Name),
 		},
 	})
@@ -595,8 +595,8 @@ func getPeerPremiumRate(ctx *cli.Context) error {
 
 	res, err := client.GetPremiumRate(context.Background(), &peerswaprpc.GetPremiumRateRequest{
 		NodeId:    ctx.String(nodeIdFlag.Name),
-		Asset:     peerswaprpc.AssetType(peerswaprpc.AssetType_value[strings.ToUpper(assetFlag.Name)]),
-		Operation: peerswaprpc.OperationType(peerswaprpc.OperationType_value[strings.ToUpper(operationFlag.Name)]),
+		Asset:     peerswaprpc.AssetType(peerswaprpc.AssetType_value[ctx.String(strings.ToUpper(assetFlag.Name))]),
+		Operation: peerswaprpc.OperationType(peerswaprpc.OperationType_value[ctx.String(strings.ToUpper(operationFlag.Name))]),
 	})
 	if err != nil {
 		return err
@@ -615,8 +615,8 @@ func updatePremiumRate(ctx *cli.Context) error {
 	res, err := client.UpdatePremiumRate(context.Background(), &peerswaprpc.UpdatePremiumRateRequest{
 		NodeId: ctx.String(nodeIdFlag.Name),
 		Rate: &peerswaprpc.PremiumRate{
-			Asset:          peerswaprpc.AssetType(peerswaprpc.AssetType_value[strings.ToUpper(assetFlag.Name)]),
-			Operation:      peerswaprpc.OperationType(peerswaprpc.OperationType_value[strings.ToUpper(operationFlag.Name)]),
+			Asset:          peerswaprpc.AssetType(peerswaprpc.AssetType_value[ctx.String(strings.ToUpper(assetFlag.Name))]),
+			Operation:      peerswaprpc.OperationType(peerswaprpc.OperationType_value[ctx.String(strings.ToUpper(operationFlag.Name))]),
 			PremiumRatePpm: ctx.Int64(rateFlag.Name),
 		},
 	})

diff --git a/peerswaprpc/server.go b/peerswaprpc/server.go
@@ -621,6 +621,9 @@ func (p *PeerswapServer) UpdateDefaultPremiumRate(ctx context.Context,
 		toPremiumOperationType(request.GetRate().GetOperation()),
 		premium.NewPPM(request.GetRate().GetPremiumRatePpm()),
 	)
+	if err != nil {
+		return nil, fmt.Errorf("could not create rate: %v", err)
+	}
 	err = p.ps.SetDefaultRate(rate)
 	if err != nil {
 		return nil, fmt.Errorf("could not set default rate: %v", err)
@@ -657,6 +660,9 @@ func (p *PeerswapServer) UpdatePremiumRate(ctx context.Context,
 		toPremiumOperationType(request.GetRate().GetOperation()),
 		premium.NewPPM(request.GetRate().GetPremiumRatePpm()),
 	)
+	if err != nil {
+		return nil, fmt.Errorf("could not create rate: %v", err)
+	}
 	err = p.ps.SetRate(request.GetNodeId(), rate)
 	if err != nil {
 		return nil, fmt.Errorf("could not set rate: %v", err)