Skip to content

Remove defaultAddress helper from platformvm service tests #2767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenButtolph merged 4 commits into from
Feb 23, 2024
Merged

Remove defaultAddress helper from platformvm service tests #2767

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dea55c6
Remove `defaultAddress` from platformvm service tests
dhrubabasu Feb 23, 2024
ccb62da
pass CI
dhrubabasu Feb 23, 2024
9bcbb96
nit
dhrubabasu Feb 23, 2024
e573d9f
simplify
dhrubabasu Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions vms/platformvm/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,7 @@ var (

func defaultService(t *testing.T) (*Service, *mutableSharedMemory) {
vm, _, mutableSharedMemory := defaultVM(t, latestFork)
vm.ctx.Lock.Lock()
defer vm.ctx.Lock.Unlock()
ks := keystore.New(logging.NoLog{}, memdb.New())
require.NoError(t, ks.CreateUser(testUsername, testPassword))

vm.ctx.Keystore = ks.NewBlockchainKeyStore(vm.ctx.ChainID)
return &Service{
vm: vm,
addrManager: avax.NewAddressManager(vm.ctx),
Expand All @@ -89,30 +84,30 @@ func defaultService(t *testing.T) (*Service, *mutableSharedMemory) {
}, mutableSharedMemory
}

// Give user [testUsername] control of [testPrivateKey] and keys[0] (which is funded)
func defaultAddress(t *testing.T, service *Service) {
func TestExportKey(t *testing.T) {
require := require.New(t)

service, _ := defaultService(t)
service.vm.ctx.Lock.Lock()
defer service.vm.ctx.Lock.Unlock()

ks := keystore.New(logging.NoLog{}, memdb.New())
require.NoError(ks.CreateUser(testUsername, testPassword))
service.vm.ctx.Keystore = ks.NewBlockchainKeyStore(service.vm.ctx.ChainID)

user, err := vmkeystore.NewUserFromKeystore(service.vm.ctx.Keystore, testUsername, testPassword)
require.NoError(err)

pk, err := secp256k1.ToPrivateKey(testPrivateKey)
require.NoError(err)

require.NoError(user.PutKeys(pk, keys[0]))
}

func TestExportKey(t *testing.T) {
require := require.New(t)
jsonString := `{"username":"ScoobyUser","password":"ShaggyPassword1Zoinks!","address":"` + testAddress + `"}`
service.vm.ctx.Lock.Unlock()

jsonString := `{"username":"` + testUsername + `","password":"` + testPassword + `","address":"` + testAddress + `"}`
args := ExportKeyArgs{}
require.NoError(json.Unmarshal([]byte(jsonString), &args))

service, _ := defaultService(t)
defaultAddress(t, service)

reply := ExportKeyReply{}
require.NoError(service.ExportKey(nil, &args, &reply))

Expand All @@ -123,7 +118,6 @@ func TestExportKey(t *testing.T) {
func TestGetTxStatus(t *testing.T) {
require := require.New(t)
service, mutableSharedMemory := defaultService(t)
defaultAddress(t, service)
service.vm.ctx.Lock.Lock()

recipientKey, err := secp256k1.NewPrivateKey()
Expand Down Expand Up @@ -276,7 +270,6 @@ func TestGetTx(t *testing.T) {
t.Run(testName, func(t *testing.T) {
require := require.New(t)
service, _ := defaultService(t)
defaultAddress(t, service)
service.vm.ctx.Lock.Lock()

tx, err := test.createTx(service)
Expand Down Expand Up @@ -341,7 +334,6 @@ func TestGetTx(t *testing.T) {
func TestGetBalance(t *testing.T) {
require := require.New(t)
service, _ := defaultService(t)
defaultAddress(t, service)

// Ensure GetStake is correct for each of the genesis validators
genesis, _ := defaultGenesis(t, service.vm.ctx.AVAXAssetID)
Expand Down Expand Up @@ -370,7 +362,6 @@ func TestGetBalance(t *testing.T) {
func TestGetStake(t *testing.T) {
require := require.New(t)
service, _ := defaultService(t)
defaultAddress(t, service)

// Ensure GetStake is correct for each of the genesis validators
genesis, _ := defaultGenesis(t, service.vm.ctx.AVAXAssetID)
Expand Down Expand Up @@ -543,7 +534,6 @@ func TestGetStake(t *testing.T) {
func TestGetCurrentValidators(t *testing.T) {
require := require.New(t)
service, _ := defaultService(t)
defaultAddress(t, service)

genesis, _ := defaultGenesis(t, service.vm.ctx.AVAXAssetID)

Expand Down