add missing changes from merge

onflow · Oct 18, 2024 · fec1699 · fec1699
1 parent b4f3a13
commit fec1699
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)