From b2a12cc2dcdaf3a224caf8ae5e91c52551dd0a36 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 14 Apr 2019 22:19:23 +0200
Subject: [PATCH] Refactor dummies

Signed-off-by: Rahix <rahix@rahix.de>
---
 component.lua | 12 +++++-------
 event.lua     | 11 +++++++----
 network.lua   | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/component.lua b/component.lua
index 4eb9a60a3dea..215d3d123f0c 100644
--- a/component.lua
+++ b/component.lua
@@ -1,8 +1,6 @@
-network = require("network")
+local network = require("network")
 
-component = {}
-
-modem = {}
+local modem = {}
 
 function modem.open(port)
   -- Nothing
@@ -16,6 +14,6 @@ function modem.broadcast(port, msg)
   network.broadcast(port, msg)
 end
 
-component.modem = modem
-
-return component
+return {
+  modem = modem,
+}
diff --git a/event.lua b/event.lua
index 4d7aca95b32d..5a8e7bd367f8 100644
--- a/event.lua
+++ b/event.lua
@@ -1,9 +1,10 @@
-network = require("network")
+local network = require("network")
+local component = require("component")
 
-event = {}
+local event = {}
 
-addr_num = 0
-last_msg = nil
+local addr_num = 0
+local last_msg = nil
 
 function event.listen(event, callback)
   if event ~= "modem_message" then
@@ -20,6 +21,8 @@ function event.listen(event, callback)
       dist=dist,
       msg=msg,
     }
+    -- Inject local address so the check passes
+    component.modem.address = addr1
     callback(ev, addr1, addr2, port, dist, msg)
   end
   network.register(addr, ev_callback)
diff --git a/network.lua b/network.lua
index 46bf7bf8b190..519035913a9e 100644
--- a/network.lua
+++ b/network.lua
@@ -1,9 +1,9 @@
-network = {}
-network.allow_blackhole = false
+local network = {
+  allow_blackhole = false,
+}
 
-nodes = {}
-
-active_node = {}
+local nodes = {}
+local active_node = {}
 
 function network.register(addr, callback)
   if nodes[addr] ~= nil then