From e9f4693e18bf94c512f7835c0807689692b2e3f8 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Fri, 10 Jul 2020 08:39:39 +0300 Subject: [PATCH] wallet: adjust `isDefault` field name Part of #1130 --- .docker/wallets/wallet1.json | 4 ++-- .docker/wallets/wallet1_solo.json | 6 +++--- .docker/wallets/wallet2.json | 4 ++-- .docker/wallets/wallet3.json | 4 ++-- .docker/wallets/wallet4.json | 4 ++-- pkg/consensus/testdata/wallet1.json | 4 ++-- pkg/consensus/testdata/wallet2.json | 4 ++-- pkg/consensus/testdata/wallet3.json | 4 ++-- pkg/consensus/testdata/wallet4.json | 4 ++-- pkg/wallet/account.go | 2 +- pkg/wallet/testdata/wallet1.json | 4 ++-- pkg/wallet/testdata/wallet2.json | 6 +++--- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.docker/wallets/wallet1.json b/.docker/wallets/wallet1.json index 0e7102d1c..2d030a384 100644 --- a/.docker/wallets/wallet1.json +++ b/.docker/wallets/wallet1.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/.docker/wallets/wallet1_solo.json b/.docker/wallets/wallet1_solo.json index cc6da19a8..3635ee985 100644 --- a/.docker/wallets/wallet1_solo.json +++ b/.docker/wallets/wallet1_solo.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "NYqxsNMHxDg3T19APYP27mBZFfauC4zngR", @@ -58,7 +58,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/.docker/wallets/wallet2.json b/.docker/wallets/wallet2.json index 954833570..04cafc643 100644 --- a/.docker/wallets/wallet2.json +++ b/.docker/wallets/wallet2.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/.docker/wallets/wallet3.json b/.docker/wallets/wallet3.json index 09a5aa8b7..f23698df8 100644 --- a/.docker/wallets/wallet3.json +++ b/.docker/wallets/wallet3.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/.docker/wallets/wallet4.json b/.docker/wallets/wallet4.json index 0a6c5fd06..a7f69aaef 100644 --- a/.docker/wallets/wallet4.json +++ b/.docker/wallets/wallet4.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/consensus/testdata/wallet1.json b/pkg/consensus/testdata/wallet1.json index 0e7102d1c..2d030a384 100644 --- a/pkg/consensus/testdata/wallet1.json +++ b/pkg/consensus/testdata/wallet1.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/consensus/testdata/wallet2.json b/pkg/consensus/testdata/wallet2.json index 954833570..04cafc643 100644 --- a/pkg/consensus/testdata/wallet2.json +++ b/pkg/consensus/testdata/wallet2.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/consensus/testdata/wallet3.json b/pkg/consensus/testdata/wallet3.json index 09a5aa8b7..f23698df8 100644 --- a/pkg/consensus/testdata/wallet3.json +++ b/pkg/consensus/testdata/wallet3.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/consensus/testdata/wallet4.json b/pkg/consensus/testdata/wallet4.json index 0a6c5fd06..a7f69aaef 100644 --- a/pkg/consensus/testdata/wallet4.json +++ b/pkg/consensus/testdata/wallet4.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/wallet/account.go b/pkg/wallet/account.go index 544e94d60..6ec829f21 100644 --- a/pkg/wallet/account.go +++ b/pkg/wallet/account.go @@ -44,7 +44,7 @@ type Account struct { Locked bool `json:"lock"` // Indicates whether the account is the default change account. - Default bool `json:"isDefault"` + Default bool `json:"isdefault"` } // Contract represents a subset of the smartcontract to embed in the diff --git a/pkg/wallet/testdata/wallet1.json b/pkg/wallet/testdata/wallet1.json index 0e7102d1c..2d030a384 100644 --- a/pkg/wallet/testdata/wallet1.json +++ b/pkg/wallet/testdata/wallet1.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false } ], "scrypt": { diff --git a/pkg/wallet/testdata/wallet2.json b/pkg/wallet/testdata/wallet2.json index 9fbfa2656..e8d41cbcc 100644 --- a/pkg/wallet/testdata/wallet2.json +++ b/pkg/wallet/testdata/wallet2.json @@ -16,7 +16,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2", @@ -41,7 +41,7 @@ "deployed": false }, "lock": false, - "isDefault": false + "isdefault": false }, { "address": "NNsXzAGGVY3H3viPHzaoD6BcVtqNCdMAHZ", @@ -58,7 +58,7 @@ "deployed": false }, "lock": false, - "isDefault": true + "isdefault": true } ], "scrypt": {