From fec169966ca3060e9275f3c636fbafaaff3201b1 Mon Sep 17 00:00:00 2001 From: Tarak Ben youssef Date: Thu, 17 Oct 2024 18:59:23 -0600 Subject: [PATCH] add missing changes from merge --- lib/go/test/flow_epoch_test.go | 10 ++++++++++ lib/go/test/flow_idtable_staking_test.go | 4 ++-- lib/go/test/flow_stakingcollection_test.go | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/go/test/flow_epoch_test.go b/lib/go/test/flow_epoch_test.go index a4b5f18e..4eefdd7d 100644 --- a/lib/go/test/flow_epoch_test.go +++ b/lib/go/test/flow_epoch_test.go @@ -554,8 +554,13 @@ func TestEpochAdvance(t *testing.T) { registerNodesForStaking(t, b, env, addresses, + signers, + stakingPublicKeys, + stakingKeyPOPs, + networkingPublicKeys, ids) + // Set the approved node list tx := createTxWithTemplateAndAuthorizer(b, templates.GenerateSetApprovedNodesScript(env), idTableAddress) approvedNodeIDs := generateCadenceNodeDictionary(ids) @@ -709,8 +714,13 @@ func TestEpochQCDKGNodeRegistration(t *testing.T) { stakingKeyPOPs, networkingPublicKeys, ids) + + // Set the approved node list + tx := createTxWithTemplateAndAuthorizer(b, templates.GenerateSetApprovedNodesScript(env), idTableAddress) + approvedNodeIDs := generateCadenceNodeDictionary(ids) err := tx.AddArgument(approvedNodeIDs) + require.NoError(t, err) signAndSubmit( t, b, tx, diff --git a/lib/go/test/flow_idtable_staking_test.go b/lib/go/test/flow_idtable_staking_test.go index 82230947..01ccf645 100644 --- a/lib/go/test/flow_idtable_staking_test.go +++ b/lib/go/test/flow_idtable_staking_test.go @@ -795,7 +795,7 @@ func TestIDTableApprovals(t *testing.T) { // Create new keys for the ID table account IDTableAccountKey, IDTableSigner := accountKeys.NewWithSigner() - _, adminStakingKey, adminStakingPoP, _, adminNetworkingKey := generateKeysForNodeRegistration(t) + _, adminStakingKey, adminStakingPOP, _, adminNetworkingKey := generateKeysForNodeRegistration(t) idTableAddress, feesAddr := deployStakingContract(t, b, IDTableAccountKey, IDTableSigner, &env, true, []uint64{3, 3, 3, 3, 3}) mintTokensForAccount(t, b, env, idTableAddress, "1000000000.0") @@ -820,7 +820,7 @@ func TestIDTableApprovals(t *testing.T) { fmt.Sprintf("%0128d", admin), adminNetworkingKey, adminStakingKey, - adminStakingPoP, + adminStakingPOP, amountToCommit, committed[adminID], 1, diff --git a/lib/go/test/flow_stakingcollection_test.go b/lib/go/test/flow_stakingcollection_test.go index 3a152a18..546dfa90 100644 --- a/lib/go/test/flow_stakingcollection_test.go +++ b/lib/go/test/flow_stakingcollection_test.go @@ -2956,7 +2956,6 @@ func TestStakingCollectionRegisterMultipleNodes(t *testing.T) { // Create arrays for the node account information nodeStakingKeys := make([]cadence.Value, numNodes) - nodeStakingKeyPOPs := make([]cadence.Value, numNodes) nodeNetworkingKeys := make([]cadence.Value, numNodes) nodeStakingKeyPOPs := make([]cadence.Value, numNodes) nodeNetworkingAddresses := make([]cadence.Value, numNodes)