1 files changed, 7 insertions, 16 deletions
diff --git a/vendor_libs/test_vendor_lib/model/setup/phy_layer_factory.h b/vendor_libs/test_vendor_lib/model/setup/phy_layer_factory.h
index 003236a8c..aaf14f832 100644
--- a/vendor_libs/test_vendor_lib/model/setup/phy_layer_factory.h
+++ b/vendor_libs/test_vendor_lib/model/setup/phy_layer_factory.h
@@ -20,7 +20,8 @@
 #include <vector>
 
 #include "include/phy.h"
-#include "packets/link_layer_packets.h"
+#include "packets/link_layer/link_layer_packet_builder.h"
+#include "packets/link_layer/link_layer_packet_view.h"
 #include "phy_layer.h"
 
 namespace test_vendor_lib {
@@ -37,9 +38,7 @@ class PhyLayerFactory {
 
   uint32_t GetFactoryId();
 
-  std::shared_ptr<PhyLayer> GetPhyLayer(
-      const std::function<void(model::packets::LinkLayerPacketView)>&
-          device_receive);
+  std::shared_ptr<PhyLayer> GetPhyLayer(const std::function<void(packets::LinkLayerPacketView)>& device_receive);
 
   void UnregisterPhyLayer(uint32_t id);
 
@@ -48,10 +47,7 @@ class PhyLayerFactory {
   virtual std::string ToString() const;
 
  protected:
-  virtual void Send(
-      const std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet,
-      uint32_t id);
-  virtual void Send(model::packets::LinkLayerPacketView packet, uint32_t id);
+  virtual void Send(const std::shared_ptr<packets::LinkLayerPacketBuilder> packet, uint32_t id);
 
  private:
   Phy::Type phy_type_;
@@ -62,17 +58,12 @@ class PhyLayerFactory {
 
 class PhyLayerImpl : public PhyLayer {
  public:
-  PhyLayerImpl(Phy::Type phy_type, uint32_t id,
-               const std::function<void(model::packets::LinkLayerPacketView)>&
-                   device_receive,
+  PhyLayerImpl(Phy::Type phy_type, uint32_t id, const std::function<void(packets::LinkLayerPacketView)>& device_receive,
                const std::shared_ptr<PhyLayerFactory>& factory);
   virtual ~PhyLayerImpl() override;
 
-  virtual void Send(
-      const std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet)
-      override;
-  virtual void Send(model::packets::LinkLayerPacketView packet) override;
-  virtual void Receive(model::packets::LinkLayerPacketView packet) override;
+  virtual void Send(const std::shared_ptr<packets::LinkLayerPacketBuilder> packet) override;
+  virtual void Receive(packets::LinkLayerPacketView packet) override;
   virtual void Unregister() override;
   virtual bool IsFactoryId(uint32_t factory_id) override;
   virtual void TimerTick() override;