Fix delegation address and extra height

tests/mbt/driver/mbt_test.go

@@ -651,7 +651,6 @@ func CompareValidatorSets(
 				// get the validator for that address on the provider
 				providerVal, err := driver.providerStakingKeeper().GetValidatorByConsAddr(driver.providerCtx(), providerConsAddr.Address)
 				require.Nil(t, err, "Error getting provider validator")
-				require.True(t, found, "Error getting provider validator")
 
 				// use the moniker of that validator
 				consumerCurValSet[providerVal.GetMoniker()] = val.Power

tests/mbt/driver/setup.go

@@ -185,7 +185,7 @@ func getAppBytesAndSenders(
 		stakingValidators = append(stakingValidators, validator)
 
 		// Store delegation from the model delegator account
-		delegations = append(delegations, stakingtypes.NewDelegation(senderAccounts[0].SenderAccount.GetAddress().String(), val.Address.String(), delShares))
+		delegations = append(delegations, stakingtypes.NewDelegation(senderAccounts[0].SenderAccount.GetAddress().String(), validator.GetOperator(), delShares))
 
 		// add initial validator powers so consumer InitGenesis runs correctly
 		pub, _ := val.ToProto()
@@ -271,16 +271,6 @@ func newChain(
 		},
 	)
 
-	app.Commit()
-
-	app.FinalizeBlock(
-		&abcitypes.RequestFinalizeBlock{
-			Hash:               app.LastCommitID().Hash,
-			Height:             app.LastBlockHeight() + 1,
-			NextValidatorsHash: validators.Hash(),
-		},
-	)
-
 	chain := &ibctesting.TestChain{
 		TB:          t,
 		Coordinator: coord,