Merge bc1869d into 9e04b8d

HackerExperience · Oct 8, 2017 · 95aeab4 · 95aeab4
2 parents 9e04b8d + bc1869d
commit 95aeab4
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/lib/account/model/account.ex b/lib/account/model/account.ex
@@ -4,7 +4,7 @@ defmodule Helix.Account.Model.Account do
   use HELL.ID, field: :account_id, meta: [0x0001]
 
   import Ecto.Changeset
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Comeonin.Bcrypt
   alias Ecto.Changeset

diff --git a/lib/cache/action/cache.ex b/lib/cache/action/cache.ex
@@ -34,7 +34,7 @@ defmodule Helix.Cache.Action.Cache do
   Follow these rules and no one will get hurt.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Hardware.Model.Component

diff --git a/lib/cache/internal/cache.ex b/lib/cache/internal/cache.ex
@@ -7,7 +7,7 @@ defmodule Helix.Cache.Internal.Cache do
   responsible for coordinating all other Internal modules.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Cache.Model.Cacheable
   alias Helix.Cache.Model.ComponentCache

diff --git a/lib/cache/internal/populate.ex b/lib/cache/internal/populate.ex
@@ -12,7 +12,7 @@ defmodule Helix.Cache.Internal.Populate do
   own logic for populating the cache database.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Cache.Repo
   alias Helix.Cache.Model.Cacheable

diff --git a/lib/cache/query/cache.ex b/lib/cache/query/cache.ex
@@ -9,7 +9,7 @@ defmodule Helix.Cache.Query.Cache do
   invalid data etc)
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Entity.Model.Entity

diff --git a/lib/entity/action/database.ex b/lib/entity/action/database.ex
@@ -3,7 +3,7 @@ defmodule Helix.Entity.Action.Database do
   API used to modify the Hacked Database.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Entity.Query.Entity, as: EntityQuery

diff --git a/lib/event/loggable/flow.ex b/lib/event/loggable/flow.ex
@@ -18,7 +18,7 @@ defmodule Helix.Event.Loggable.Flow do
   For an implementation example, see `lib/software/event/file.ex`.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Event

diff --git a/lib/event/notification_handler.ex b/lib/event/notification_handler.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Event.NotificationHandler do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.Utils
   alias Helix.Event.Notificable

diff --git a/lib/hell/hell/macro_helpers.ex b/lib/hell/hell/macro_helpers.ex
@@ -1,4 +1,4 @@
-defmodule HELL.MacroHelpers do
+defmodule HELL.Macros do
   @moduledoc """
   Useful macros spread throughout Helix codebase.
   """

diff --git a/lib/network/action/tunnel.ex b/lib/network/action/tunnel.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Network.Action.Tunnel do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Server.Henforcer.Server, as: ServerHenforcer
   alias Helix.Server.Model.Server

diff --git a/lib/network/public/network.ex b/lib/network/public/network.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Network.Public.Network do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Cache.Query.Cache, as: CacheQuery

diff --git a/lib/process/action/process.ex b/lib/process/action/process.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Process.Action.Process do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Entity.Model.Entity

diff --git a/lib/process/model/process/naive_struct.ex b/lib/process/model/process/naive_struct.ex
@@ -1,7 +1,7 @@
 defmodule Helix.Process.Model.Process.NaiveStruct do
   @moduledoc false
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   docp """
   This module is a converter that transforms any struct into a non-struct map

diff --git a/lib/process/public/view/helper.ex b/lib/process/public/view/helper.ex
@@ -3,7 +3,7 @@ defmodule Helix.Process.Public.View.Process.Helper do
   Helper functions for `ProcessView` and `ProcessViewable`.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.ClientUtils
   alias Helix.Cache.Query.Cache, as: CacheQuery

diff --git a/lib/server/public/index.ex b/lib/server/public/index.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Server.Public.Index do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Cache.Query.Cache, as: CacheQuery
   alias Helix.Entity.Model.Entity

diff --git a/lib/server/state/websocket/server.ex b/lib/server/state/websocket/server.ex
@@ -43,7 +43,7 @@ defmodule Helix.Server.State.Websocket.Channel do
 
   use GenServer
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.IPv4
   alias Helix.Entity.Model.Entity

diff --git a/lib/server/websocket/channel/server/join.ex b/lib/server/websocket/channel/server/join.ex
@@ -23,7 +23,7 @@ defmodule Helix.Server.Websocket.Channel.Server.Join do
 
   defimpl Helix.Websocket.Joinable do
 
-    import HELL.MacroHelpers
+    import HELL.Macros
 
     alias HELL.IPv4
     alias Helix.Cache.Query.Cache, as: CacheQuery

diff --git a/lib/server/websocket/channel/server/requests/file_download.ex b/lib/server/websocket/channel/server/requests/file_download.ex
@@ -6,7 +6,7 @@ defmodule Helix.Server.Websocket.Channel.Server.Requests.FileDownload do
 
   defimpl Helix.Websocket.Requestable do
 
-    import HELL.MacroHelpers
+    import HELL.Macros
 
     alias Helix.Websocket.Utils, as: WebsocketUtils
     alias Helix.Cache.Query.Cache, as: CacheQuery

diff --git a/lib/software/action/flow/file/transfer.ex b/lib/software/action/flow/file/transfer.ex
@@ -1,7 +1,7 @@
 defmodule Helix.Software.Action.Flow.File.Transfer do
 
   import HELF.Flow
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Event
   alias Helix.Network.Action.Tunnel, as: TunnelAction

diff --git a/lib/software/event/handler/cracker.ex b/lib/software/event/handler/cracker.ex
@@ -1,7 +1,7 @@
 defmodule Helix.Software.Event.Handler.Cracker do
 
   import HELF.Flow
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Event
   alias Helix.Entity.Query.Entity, as: EntityQuery

diff --git a/lib/software/model/file.ex b/lib/software/model/file.ex
@@ -4,7 +4,7 @@ defmodule Helix.Software.Model.File do
   use HELL.ID, field: :file_id, meta: [0x0020]
 
   import Ecto.Changeset
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Ecto.Changeset
   alias HELL.Constant

diff --git a/lib/story/event/handler/story.ex b/lib/story/event/handler/story.ex
@@ -10,7 +10,7 @@ defmodule Helix.Story.Event.Handler.Story do
   """
 
   import HELF.Flow
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Event
   alias Helix.Story.Action.Story, as: StoryAction

diff --git a/lib/story/internal/email.ex b/lib/story/internal/email.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Story.Internal.Email do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Entity.Model.Entity
   alias Helix.Story.Model.Step

diff --git a/lib/story/model/step.ex b/lib/story/model/step.ex
@@ -7,7 +7,7 @@ defmodule Helix.Story.Model.Step do
   `lib/story/model/steppable.ex`
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.Constant
   alias Helix.Event

diff --git a/lib/story/model/step/macros.ex b/lib/story/model/step/macros.ex
@@ -6,7 +6,7 @@ defmodule Helix.Story.Model.Step.Macros do
   documentation instead.
   """
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias HELL.Constant
   alias HELL.Utils

diff --git a/test/server/state/websocket/server_test.exs b/test/server/state/websocket/server_test.exs
@@ -2,7 +2,7 @@ defmodule Helix.Server.State.Websocket.ChannelTest do
 
   use ExUnit.Case, async: true
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Entity.Model.Entity
   alias Helix.Network.Model.Network

diff --git a/test/story/model/story_email_test.exs b/test/story/model/story_email_test.exs
@@ -3,7 +3,7 @@ defmodule Helix.Story.Model.StoryEmailTest do
   use ExUnit.Case, async: true
 
   import Ecto.Changeset
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Entity.Model.Entity
   alias Helix.Story.Model.StoryEmail

diff --git a/test/support/event/setup/software.ex b/test/support/event/setup/software.ex
@@ -1,6 +1,6 @@
 defmodule Helix.Test.Event.Setup.Software do
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   alias Helix.Entity.Model.Entity
   alias Helix.Network.Model.Connection

diff --git a/test/support/hell/random.ex b/test/support/hell/random.ex
@@ -4,7 +4,7 @@ defmodule HELL.TestHelper.Random do
   alias HELL.TestHelper.Random.Alphabet.Alphanum
   alias HELL.TestHelper.Random.Alphabet.Digits
 
-  import HELL.MacroHelpers
+  import HELL.Macros
 
   @type string_params :: [
     {:min, integer},