From 2abda92083a7a59a335d01127975231f2e24a23f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Mar 2024 16:49:09 -0500 Subject: [PATCH] fix: rename extended key struct keys for clarity Signed-off-by: Chris Gianelloni --- bursa.go | 36 ++++++++++++++++++------------------ internal/cli/cli.go | 8 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bursa.go b/bursa.go index 396a974..592b914 100644 --- a/bursa.go +++ b/bursa.go @@ -35,15 +35,15 @@ type KeyFile struct { } type Wallet struct { - Mnemonic string `json:"mnemonic"` - PaymentAddress string `json:"payment_address"` - StakeAddress string `json:"stake_address"` - PaymentVKey KeyFile `json:"payment_kvey"` - PaymentSKey KeyFile `json:"payment_skey"` - PaymentESKey KeyFile `json:"payment_extended_skey"` - StakeVKey KeyFile `json:"stake_vkey"` - StakeSKey KeyFile `json:"stake_skey"` - StakeESKey KeyFile `json:"stake_extended_skey"` + Mnemonic string `json:"mnemonic"` + PaymentAddress string `json:"payment_address"` + StakeAddress string `json:"stake_address"` + PaymentVKey KeyFile `json:"payment_kvey"` + PaymentSKey KeyFile `json:"payment_skey"` + PaymentExtendedSKey KeyFile `json:"payment_extended_skey"` + StakeVKey KeyFile `json:"stake_vkey"` + StakeSKey KeyFile `json:"stake_skey"` + StakeExtendedSKey KeyFile `json:"stake_extended_skey"` } func NewWallet( @@ -60,15 +60,15 @@ func NewWallet( stakeKey := GetStakeKey(accountKey, stakeId) addr := GetAddress(accountKey, network, addressId) w := &Wallet{ - Mnemonic: mnemonic, - PaymentAddress: addr.String(), - StakeAddress: addr.ToReward().String(), - PaymentVKey: GetPaymentVKey(paymentKey), - PaymentSKey: GetPaymentSKey(paymentKey), - PaymentESKey: GetPaymentExtendedSKey(paymentKey), - StakeVKey: GetStakeVKey(stakeKey), - StakeSKey: GetStakeSKey(stakeKey), - StakeESKey: GetStakeExtendedSKey(stakeKey), + Mnemonic: mnemonic, + PaymentAddress: addr.String(), + StakeAddress: addr.ToReward().String(), + PaymentVKey: GetPaymentVKey(paymentKey), + PaymentSKey: GetPaymentSKey(paymentKey), + PaymentExtendedSKey: GetPaymentExtendedSKey(paymentKey), + StakeVKey: GetStakeVKey(stakeKey), + StakeSKey: GetStakeSKey(stakeKey), + StakeExtendedSKey: GetStakeExtendedSKey(stakeKey), } return w, nil } diff --git a/internal/cli/cli.go b/internal/cli/cli.go index b8c8a51..698c02e 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -63,10 +63,10 @@ func Run() { fmt.Printf("payment.vkey=%s\n", bursa.GetKeyFile(w.PaymentVKey)) fmt.Printf("payment.skey=%s\n", bursa.GetKeyFile(w.PaymentSKey)) - fmt.Printf("paymentExtended.skey=%s\n", bursa.GetKeyFile(w.PaymentESKey)) + fmt.Printf("paymentExtended.skey=%s\n", bursa.GetKeyFile(w.PaymentExtendedSKey)) fmt.Printf("stake.vkey=%s\n", bursa.GetKeyFile(w.StakeVKey)) fmt.Printf("stake.skey=%s\n", bursa.GetKeyFile(w.StakeSKey)) - fmt.Printf("stakeExtended.skey=%s\n", bursa.GetKeyFile(w.StakeESKey)) + fmt.Printf("stakeExtended.skey=%s\n", bursa.GetKeyFile(w.StakeExtendedSKey)) } else { fmt.Printf("Output dir: %v\n", *flagOutput) _, err := os.Stat(*flagOutput) @@ -82,10 +82,10 @@ func Run() { {"stake.addr": w.StakeAddress}, {"payment.vkey": bursa.GetKeyFile(w.PaymentVKey)}, {"payment.skey": bursa.GetKeyFile(w.PaymentSKey)}, - {"paymentExtended.skey": bursa.GetKeyFile(w.PaymentESKey)}, + {"paymentExtended.skey": bursa.GetKeyFile(w.PaymentExtendedSKey)}, {"stake.vkey": bursa.GetKeyFile(w.StakeVKey)}, {"stake.skey": bursa.GetKeyFile(w.StakeSKey)}, - {"stakeExtended.skey": bursa.GetKeyFile(w.StakeESKey)}, + {"stakeExtended.skey": bursa.GetKeyFile(w.StakeExtendedSKey)}, } var g errgroup.Group for _, m := range fileMap {