Skip to content

Commit 6086f8a

Browse files
committed
Fixes
1 parent cc11261 commit 6086f8a

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

client/main.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -342,15 +342,15 @@ func send(ctx *cli.Context) error {
342342
return fmt.Errorf("missing destination, use --to and --amount or --receivers")
343343
}
344344

345-
var receivers []arksdk.Receiver
345+
var receivers []types.Receiver
346346
var err error
347347
if receiversJSON != "" {
348348
receivers, err = parseReceivers(receiversJSON)
349349
if err != nil {
350350
return err
351351
}
352352
} else {
353-
receivers = []arksdk.Receiver{arksdk.NewBitcoinReceiver(to, amount)}
353+
receivers = []types.Receiver{{To: to, Amount: amount}}
354354
}
355355

356356
password, err := readPassword(ctx)
@@ -497,23 +497,23 @@ func loadOrCreateClient(
497497
return client, err
498498
}
499499

500-
func parseReceivers(receveirsJSON string) ([]arksdk.Receiver, error) {
500+
func parseReceivers(receveirsJSON string) ([]types.Receiver, error) {
501501
list := make([]map[string]interface{}, 0)
502502
if err := json.Unmarshal([]byte(receveirsJSON), &list); err != nil {
503503
return nil, err
504504
}
505505

506-
receivers := make([]arksdk.Receiver, 0, len(list))
506+
receivers := make([]types.Receiver, 0, len(list))
507507
for _, v := range list {
508-
receivers = append(receivers, arksdk.NewBitcoinReceiver(
509-
v["to"].(string), uint64(v["amount"].(float64)),
510-
))
508+
receivers = append(receivers, types.Receiver{
509+
To: v["to"].(string), Amount: uint64(v["amount"].(float64)),
510+
})
511511
}
512512
return receivers, nil
513513
}
514514

515-
func sendCovenantLess(ctx *cli.Context, receivers []arksdk.Receiver, withZeroFees bool) error {
516-
var onchainReceivers, offchainReceivers []arksdk.Receiver
515+
func sendCovenantLess(ctx *cli.Context, receivers []types.Receiver, withZeroFees bool) error {
516+
var onchainReceivers, offchainReceivers []types.Receiver
517517

518518
for _, receiver := range receivers {
519519
if receiver.IsOnchain() {
@@ -526,17 +526,15 @@ func sendCovenantLess(ctx *cli.Context, receivers []arksdk.Receiver, withZeroFee
526526
computeExpiration := ctx.Bool(enableExpiryCoinselectFlag.Name)
527527
if len(onchainReceivers) > 0 {
528528
txid, err := arkSdkClient.CollaborativeExit(
529-
ctx.Context, onchainReceivers[0].To(), onchainReceivers[0].Amount(), computeExpiration,
529+
ctx.Context, onchainReceivers[0].To, onchainReceivers[0].Amount, computeExpiration,
530530
)
531531
if err != nil {
532532
return err
533533
}
534534
return printJSON(map[string]string{"txid": txid})
535535
}
536536

537-
arkTxid, err := arkSdkClient.SendOffChain(
538-
ctx.Context, computeExpiration, offchainReceivers, withZeroFees,
539-
)
537+
arkTxid, err := arkSdkClient.SendOffChain(ctx.Context, computeExpiration, offchainReceivers)
540538
if err != nil {
541539
return err
542540
}

0 commit comments

Comments
 (0)