From 0c5ecca8bc989fbb2ab391f09f51bb8983e37b13 Mon Sep 17 00:00:00 2001 From: huy Date: Wed, 11 Dec 2024 08:51:15 -0800 Subject: [PATCH] fix --- internal/tests/api/status_test.go | 3 ++- testing/test-manager.go | 13 ++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/internal/tests/api/status_test.go b/internal/tests/api/status_test.go index e65c62c..17565b0 100644 --- a/internal/tests/api/status_test.go +++ b/internal/tests/api/status_test.go @@ -13,7 +13,8 @@ import ( func TestValidatorStatus_Active(t *testing.T) { err := testMgr.DependsOnStakewiseBaseline() - mainNode := testMgr.GetMainNode() + + mainNode := testMgr.GetNode() require.NoError(t, err) // Get some resources sp := mainNode.GetServiceProvider() diff --git a/testing/test-manager.go b/testing/test-manager.go index 1671c95..224b270 100644 --- a/testing/test-manager.go +++ b/testing/test-manager.go @@ -31,7 +31,6 @@ type StakeWiseTestManager struct { // The ID of the baseline snapshot baselineSnapshotID string - mainNode *StakeWiseNode mainNodeAddress common.Address nsEmail string } @@ -117,13 +116,13 @@ func NewStakeWiseTestManager() (*StakeWiseTestManager, error) { // Initialize test manager by generating a new wallet, starting the StakeWise node, and registering with NodeSet func (m *StakeWiseTestManager) SetupTest() error { - m.mainNode = m.GetNode() + mainNode := m.GetNode() m.nsEmail = "test@nodeset.io" // Generate a new wallet derivationPath := string(wallet.DerivationPath_Default) index := uint64(0) password := "test_password123" - hdNode := m.mainNode.GetHyperdriveNode() + hdNode := mainNode.GetHyperdriveNode() hd := hdNode.GetApiClient() recoverResponse, err := hd.Wallet.Recover(&derivationPath, keys.DefaultMnemonic, &index, password, true) if err != nil { @@ -132,7 +131,7 @@ func (m *StakeWiseTestManager) SetupTest() error { m.mainNodeAddress = recoverResponse.Data.AccountAddress // Set up NodeSet with the StakeWise vault - sp := m.mainNode.GetServiceProvider() + sp := mainNode.GetServiceProvider() res := sp.GetResources() nsMgr := m.GetNodeSetMockServer().GetManager() nsDB := nsMgr.GetDatabase() @@ -147,7 +146,7 @@ func (m *StakeWiseTestManager) SetupTest() error { } // Register the primary - err = m.registerWithNodeset(m.mainNode, m.mainNodeAddress) + err = m.registerWithNodeset(mainNode, m.mainNodeAddress) if err != nil { return fmt.Errorf("error registering with nodeset: %v", err) } @@ -158,10 +157,6 @@ func (m *StakeWiseTestManager) SetupTest() error { // === Getters === // =============== -func (m *StakeWiseTestManager) GetMainNode() *StakeWiseNode { - return m.mainNode -} - func (m *StakeWiseTestManager) GetModuleName() string { return "hyperdrive-stakewise" }