diff --git a/srsenb/test/mac/scheduler_test_common.cc b/srsenb/test/mac/scheduler_test_common.cc index 9fd032fb8..e7c740d6e 100644 --- a/srsenb/test/mac/scheduler_test_common.cc +++ b/srsenb/test/mac/scheduler_test_common.cc @@ -56,14 +56,12 @@ std::default_random_engine& ::srsenb::get_rand_gen() * User State Tester ***********************/ -ue_ctxt_test::ue_ctxt_test(uint16_t rnti_, - srslte::tti_point prach_tti_, - const ue_ctxt_test_cfg& cfg_, - const std::vector& cell_params_, - ue_sim& ue_ctxt_) : +ue_ctxt_test::ue_ctxt_test(uint16_t rnti_, + srslte::tti_point prach_tti_, + const ue_ctxt_test_cfg& cfg_, + ue_sim& ue_ctxt_) : sim_cfg(cfg_), rnti(rnti_), - cell_params(cell_params_), current_tti_rx(prach_tti_), ue_ctxt(&ue_ctxt_) { @@ -268,7 +266,7 @@ int user_state_sched_tester::add_user(uint16_t rnti, uint32_t preamble_idx, cons TESTASSERT(users.count(rnti) == 0); sim_users.add_user(rnti, cfg_.ue_cfg, tic, preamble_idx); - ue_ctxt_test ue{rnti, tic, cfg_, cell_params, sim_users.at(rnti)}; + ue_ctxt_test ue{rnti, tic, cfg_, sim_users.at(rnti)}; users.insert(std::make_pair(rnti, ue)); return SRSLTE_SUCCESS; diff --git a/srsenb/test/mac/scheduler_test_common.h b/srsenb/test/mac/scheduler_test_common.h index 23c45f557..3071769f7 100644 --- a/srsenb/test/mac/scheduler_test_common.h +++ b/srsenb/test/mac/scheduler_test_common.h @@ -65,11 +65,7 @@ struct ue_ctxt_test { bool drb_cfg_flag = false; - ue_ctxt_test(uint16_t rnti_, - srslte::tti_point prach_tti, - const ue_ctxt_test_cfg& cfg_, - const std::vector& cell_params_, - ue_sim& ue_ctxt_); + ue_ctxt_test(uint16_t rnti_, srslte::tti_point prach_tti, const ue_ctxt_test_cfg& cfg_, ue_sim& ue_ctxt_); int set_cfg(const sched::ue_cfg_t& ue_cfg_); cc_ue_ctxt_test* get_cc_state(uint32_t enb_cc_idx); @@ -91,8 +87,6 @@ private: int test_scell_activation(cc_result result); int schedule_acks(cc_result result); - const std::vector& cell_params; - struct pending_ack_t { srslte::tti_point tti_ack; uint32_t cc_idx, ue_cc_idx, tb, pid;