Skip to content

Commit 3c54ef6

Browse files
benmabenma
committed
backend/config: rename Configurations to SigningConfigurations
Only the struct name, not the JSON tag, so that existing configs continue to work. This is to make expressions like `account.Config().Config.Configurations` be less confusing.
1 parent 92d0f3b commit 3c54ef6

File tree

12 files changed

+95
-95
lines changed

12 files changed

+95
-95
lines changed

‎backend/accounts.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ func sortAccounts(accounts []*config.Account) {
6565
acct1 := accounts[i]
6666
acct2 := accounts[j]
6767
coinCmp := compareCoin(acct1.CoinCode, acct2.CoinCode)
68-
if coinCmp == 0 && len(acct1.Configurations) > 0 && len(acct2.Configurations) > 0 {
69-
signingCfg1 := acct1.Configurations[0]
70-
signingCfg2 := acct2.Configurations[0]
68+
if coinCmp == 0 && len(acct1.SigningConfigurations) > 0 && len(acct2.SigningConfigurations) > 0 {
69+
signingCfg1 := acct1.SigningConfigurations[0]
70+
signingCfg2 := acct2.SigningConfigurations[0]
7171
// An error should never happen here, but if it does, we just sort as if it was account
7272
// number 0.
7373
accountNumber1, _ := signingCfg1.AccountNumber()
@@ -252,13 +252,13 @@ func nextAccountNumber(coinCode coinpkg.Code, keystore keystore.Keystore, accoun
252252
if coinCode != account.CoinCode {
253253
continue
254254
}
255-
if !account.Configurations.ContainsRootFingerprint(rootFingerprint) {
255+
if !account.SigningConfigurations.ContainsRootFingerprint(rootFingerprint) {
256256
continue
257257
}
258-
if len(account.Configurations) == 0 {
258+
if len(account.SigningConfigurations) == 0 {
259259
continue
260260
}
261-
accountNumber, err := account.Configurations[0].AccountNumber()
261+
accountNumber, err := account.SigningConfigurations[0].AccountNumber()
262262
if err != nil {
263263
continue
264264
}
@@ -429,20 +429,20 @@ func (backend *Backend) createAndAddAccount(coin coinpkg.Coin, persistedConfig *
429429

430430
tokenName := token.Name()
431431

432-
accountNumber, err := accountConfig.Config.Configurations[0].AccountNumber()
432+
accountNumber, err := accountConfig.Config.SigningConfigurations[0].AccountNumber()
433433
if err != nil {
434434
backend.log.WithError(err).Error("could not get account number")
435435
} else if accountNumber > 0 {
436436
tokenName = fmt.Sprintf("%s %d", tokenName, accountNumber+1)
437437
}
438438

439439
erc20Config := &config.Account{
440-
Inactive: persistedConfig.Inactive,
441-
CoinCode: erc20CoinCode,
442-
Name: tokenName,
443-
Code: erc20AccountCode,
444-
Configurations: persistedConfig.Configurations,
445-
ActiveTokens: nil,
440+
Inactive: persistedConfig.Inactive,
441+
CoinCode: erc20CoinCode,
442+
Name: tokenName,
443+
Code: erc20AccountCode,
444+
SigningConfigurations: persistedConfig.SigningConfigurations,
445+
ActiveTokens: nil,
446446
}
447447

448448
backend.createAndAddAccount(token, erc20Config)
@@ -474,8 +474,8 @@ func (backend *Backend) persistAccount(account config.Account, accountsConfig *c
474474
if account.CoinCode == account2.CoinCode {
475475
// We detect a duplicate account (subaccount in a unified account) if any of the
476476
// configurations is already present.
477-
for _, config := range account.Configurations {
478-
for _, config2 := range account2.Configurations {
477+
for _, config := range account.SigningConfigurations {
478+
for _, config2 := range account2.SigningConfigurations {
479479
if config.ExtendedPublicKey().String() == config2.ExtendedPublicKey().String() {
480480
return errp.WithStack(ErrAccountAlreadyExists)
481481
}
@@ -540,10 +540,10 @@ func (backend *Backend) persistBTCAccountConfig(
540540

541541
if keystore.SupportsUnifiedAccounts() {
542542
return backend.persistAccount(config.Account{
543-
CoinCode: coin.Code(),
544-
Name: name,
545-
Code: code,
546-
Configurations: signingConfigurations,
543+
CoinCode: coin.Code(),
544+
Name: name,
545+
Code: code,
546+
SigningConfigurations: signingConfigurations,
547547
}, accountsConfig)
548548
}
549549

@@ -558,10 +558,10 @@ func (backend *Backend) persistBTCAccountConfig(
558558
}
559559

560560
err := backend.persistAccount(config.Account{
561-
CoinCode: coin.Code(),
562-
Name: suffixedName,
563-
Code: splitAccountCode(code, cfg.ScriptType()),
564-
Configurations: signing.Configurations{cfg},
561+
CoinCode: coin.Code(),
562+
Name: suffixedName,
563+
Code: splitAccountCode(code, cfg.ScriptType()),
564+
SigningConfigurations: signing.Configurations{cfg},
565565
}, accountsConfig)
566566
if err != nil {
567567
return err
@@ -612,11 +612,11 @@ func (backend *Backend) persistETHAccountConfig(
612612
}
613613

614614
return backend.persistAccount(config.Account{
615-
CoinCode: coin.Code(),
616-
Name: name,
617-
Code: code,
618-
Configurations: signingConfigurations,
619-
ActiveTokens: activeTokens,
615+
CoinCode: coin.Code(),
616+
Name: name,
617+
Code: code,
618+
SigningConfigurations: signingConfigurations,
619+
ActiveTokens: activeTokens,
620620
}, accountsConfig)
621621
}
622622

@@ -632,7 +632,7 @@ func (backend *Backend) initPersistedAccounts() {
632632
return
633633
}
634634
keystoreConnected := func(account *config.Account) bool {
635-
return account.Configurations.ContainsRootFingerprint(rootFingerprint)
635+
return account.SigningConfigurations.ContainsRootFingerprint(rootFingerprint)
636636
}
637637

638638
persistedAccounts := backend.config.AccountsConfig()
@@ -647,7 +647,7 @@ outer:
647647
}
648648
switch coin.(type) {
649649
case *btc.Coin:
650-
for _, cfg := range account.Configurations {
650+
for _, cfg := range account.SigningConfigurations {
651651
if !backend.keystore.SupportsAccount(coin, cfg.ScriptType()) {
652652
continue outer
653653
}
@@ -731,7 +731,7 @@ func (backend *Backend) maybeAddP2TR(keystore keystore.Keystore, accounts []*con
731731
return err
732732
}
733733
if keystore.SupportsAccount(coin, signing.ScriptTypeP2TR) &&
734-
account.Configurations.FindScriptType(signing.ScriptTypeP2TR) == -1 {
734+
account.SigningConfigurations.FindScriptType(signing.ScriptTypeP2TR) == -1 {
735735
rootFingerprint, err := backend.keystore.RootFingerprint()
736736
if err != nil {
737737
return err
@@ -740,7 +740,7 @@ func (backend *Backend) maybeAddP2TR(keystore keystore.Keystore, accounts []*con
740740
if account.CoinCode == coinpkg.CodeBTC {
741741
bip44Coin = hardenedKeystart
742742
}
743-
accountNumber, err := account.Configurations[0].AccountNumber()
743+
accountNumber, err := account.SigningConfigurations[0].AccountNumber()
744744
if err != nil {
745745
return err
746746
}
@@ -752,8 +752,8 @@ func (backend *Backend) maybeAddP2TR(keystore keystore.Keystore, accounts []*con
752752
if err != nil {
753753
return err
754754
}
755-
account.Configurations = append(
756-
account.Configurations,
755+
account.SigningConfigurations = append(
756+
account.SigningConfigurations,
757757
signing.NewBitcoinConfiguration(
758758
signing.ScriptTypeP2TR,
759759
rootFingerprint,

‎backend/accounts/baseaccount.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ func (account *BaseAccount) Initialize(accountIdentifier string) error {
153153

154154
// Append legacy notes (notes stored in files based on obsolete account identifiers). Account
155155
// identifiers changed from v4.27.0 to v4.28.0.
156-
if len(account.Config().Config.Configurations) == 0 {
156+
if len(account.Config().Config.SigningConfigurations) == 0 {
157157
return nil
158158
}
159-
accountNumber, err := account.Config().Config.Configurations[0].AccountNumber()
159+
accountNumber, err := account.Config().Config.SigningConfigurations[0].AccountNumber()
160160
if err != nil {
161161
return nil
162162
}
@@ -165,13 +165,13 @@ func (account *BaseAccount) Initialize(accountIdentifier string) error {
165165
return nil
166166
}
167167

168-
legacyConfigurations := signing.ConvertToLegacyConfigurations(account.Config().Config.Configurations)
168+
legacyConfigurations := signing.ConvertToLegacyConfigurations(account.Config().Config.SigningConfigurations)
169169
var legacyAccountIdentifiers []string
170170
switch account.coin.Code() {
171171
case coin.CodeBTC, coin.CodeTBTC, coin.CodeLTC, coin.CodeTLTC:
172172
legacyAccountIdentifiers = []string{fmt.Sprintf("account-%s-%s", legacyConfigurations.Hash(), account.coin.Code())}
173173
// Also consider split accounts:
174-
for _, cfg := range account.Config().Config.Configurations {
174+
for _, cfg := range account.Config().Config.SigningConfigurations {
175175
legacyConfigurations := signing.ConvertToLegacyConfigurations(signing.Configurations{cfg})
176176
legacyAccountIdentifier := fmt.Sprintf("account-%s-%s-%s", legacyConfigurations.Hash(), account.coin.Code(), cfg.ScriptType())
177177
legacyAccountIdentifiers = append(

‎backend/accounts/baseaccount_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestBaseAccount(t *testing.T) {
5757
Config: &config.Account{
5858
Code: "test",
5959
Name: "Test",
60-
Configurations: signing.Configurations{
60+
SigningConfigurations: signing.Configurations{
6161
signing.NewBitcoinConfiguration(signing.ScriptTypeP2PKH, []byte{1, 2, 3, 4}, derivationPath, extendedPublicKey),
6262
signing.NewBitcoinConfiguration(signing.ScriptTypeP2WPKH, []byte{1, 2, 3, 4}, derivationPath, extendedPublicKey),
6363
signing.NewBitcoinConfiguration(signing.ScriptTypeP2WPKHP2SH, []byte{1, 2, 3, 4}, derivationPath, extendedPublicKey),

0 commit comments

Comments
 (0)