Housecleaning (#176)

* switch to charlist sigils

* fix two minute module attributes

* update to newest nkeys

* require elixir 1.14 and erlang 25+

.github/workflows/CI.yml

@@ -16,15 +16,15 @@ jobs:
  strategy:
  matrix:
  pair:
- - otp: "24.3.4"
- elixir: "1.12"
+ - otp: "25.3.2"
+ elixir: "1.14"
  nats: "2.10.0"
 
- - otp: "26.2.4"
+ - otp: "26.2.5"
  elixir: "1.16.2"
  nats: "2.10.14"
 
- - otp: "24.3.4"
+ - otp: "27.1"
  elixir: "main"
  nats: "latest"
 

lib/gnat.ex

@@ -114,7 +114,7 @@ defmodule Gnat do
  }
 
  @default_connection_settings %{
- host: 'localhost',
+ host: ~c"localhost",
  port: 4222,
  tcp_opts: [:binary],
  connection_timeout: 3_000,

lib/gnat/jetstream/api/kv.ex

@@ -8,7 +8,7 @@ defmodule Gnat.Jetstream.API.KV do
 
  @stream_prefix "KV_"
  @subject_prefix "$KV."
- @two_minutes_in_nanoseconds 1_200_000_000
+ @two_minutes_in_nanoseconds 120_000_000_000
 
  @type bucket_options ::
  {:history, non_neg_integer()}

lib/gnat/jetstream/api/object.ex

@@ -209,7 +209,7 @@ defmodule Gnat.Jetstream.API.Object do
  "#{@subject_prefix}#{bucket_name}.M.#{key}"
  end
 
- @two_minutes_in_nanoseconds 1_200_000_000
+ @two_minutes_in_nanoseconds 120_000_000_000
  # The `duplicate_window` can't be greater than the `max_age`. The default `duplicate_window`
  # is 2 minutes. We'll keep the 2 minute window UNLESS the ttl is less than 2 minutes
  defp adjust_duplicate_window(ttl) when ttl > 0 and ttl < @two_minutes_in_nanoseconds, do: ttl

mix.exs

@@ -8,7 +8,7 @@ defmodule Gnat.Mixfile do
  [
  app: :gnat,
  version: @version,
- elixir: "~> 1.12",
+ elixir: "~> 1.14",
  elixirc_paths: elixirc_paths(Mix.env()),
  build_embedded: Mix.env() == :prod,
  start_permanent: Mix.env() == :prod,

mix.lock

@@ -1,26 +1,32 @@
 %{
  "benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm", "3ad58ae787e9c7c94dd7ceda3b587ec2c64604563e049b2a0e8baafae832addb"},
  "broadway": {:hex, :broadway, "1.0.7", "7808f9e3eb6f53ca6d060f0f9d61012dd8feb0d7a82e62d087dd517b9b66fa53", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.7 or ~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e76cfb0a7d64176c387b8b1ddbfb023e2ee8a63e92f43664d78e6d5d0b1177c6"},
+ "chacha20": {:hex, :chacha20, "1.0.4", "0359d8f9a32269271044c1b471d5cf69660c362a7c61a98f73a05ef0b5d9eb9e", [:mix], [], "hexpm", "2027f5d321ae9903f1f0da7f51b0635ad6b8819bc7fe397837930a2011bc2349"},
  "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
  "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
+ "curve25519": {:hex, :curve25519, "1.0.5", "f801179424e4012049fcfcfcda74ac04f65d0ffceeb80e7ef1d3352deb09f5bb", [:mix], [], "hexpm", "0fba3ad55bf1154d4d5fc3ae5fb91b912b77b13f0def6ccb3a5d58168ff4192d"},
  "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
  "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"},
  "earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm", "000aaeff08919e95e7aea13e4af7b2b9734577b3e6a7c50ee31ee88cab6ec4fb"},
  "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
- "ed25519": {:hex, :ed25519, "1.4.0", "3eee373a77c8230ac25ab1d557f436eb6ec584946d7b76ca311f9fa18db84b55", [:mix], [], "hexpm", "420b52c68e2eda14a822c1d15df6c3e386f7b604d4351d6621a2f6baa68ed6dd"},
+ "ed25519": {:hex, :ed25519, "1.4.1", "479fb83c3e31987c9cad780e6aeb8f2015fb5a482618cdf2a825c9aff809afc4", [:mix], [], "hexpm", "0dacb84f3faa3d8148e81019ca35f9d8dcee13232c32c9db5c2fb8ff48c80ec7"},
+ "equivalex": {:hex, :equivalex, "1.0.3", "170d9a82ae066e0020dfe1cf7811381669565922eb3359f6c91d7e9a1124ff74", [:mix], [], "hexpm", "46fa311adb855117d36e461b9c0ad2598f72110ad17ad73d7533c78020e045fc"},
  "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
  "ex_doc": {:hex, :ex_doc, "0.27.3", "d09ed7ab590b71123959d9017f6715b54a448d76b43cf909eb0b2e5a78a977b2", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "ee60b329d08195039bfeb25231a208749be4f2274eae42ce38f9be0538a2f2e6"},
  "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
  "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
+ "kcl": {:hex, :kcl, "1.4.2", "8b73a55a14899dc172fcb05a13a754ac171c8165c14f65043382d567922f44ab", [:mix], [{:curve25519, ">= 1.0.4", [hex: :curve25519, repo: "hexpm", optional: false]}, {:ed25519, "~> 1.3", [hex: :ed25519, repo: "hexpm", optional: false]}, {:poly1305, "~> 1.0", [hex: :poly1305, repo: "hexpm", optional: false]}, {:salsa20, "~> 1.0", [hex: :salsa20, repo: "hexpm", optional: false]}], "hexpm", "9f083dd3844d902df6834b258564a82b21a15eb9f6acdc98e8df0c10feeabf05"},
  "libgraph": {:hex, :libgraph, "0.13.3", "20732b7bafb933dcf7351c479e03076ebd14a85fd3202c67a1c197f4f7c2466b", [:mix], [], "hexpm", "78f2576eef615440b46f10060b1de1c86640441422832052686df53dc3c148c6"},
  "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"},
  "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
  "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
  "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},
  "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
- "nkeys": {:hex, :nkeys, "0.2.1", "c183105135de9d0c07d649f6a13e39792b095772cdbeaacf37dea4e35b647100", [:mix], [{:ed25519, "~> 1.3", [hex: :ed25519, repo: "hexpm", optional: false]}], "hexpm", "946551188bd103559e5129835f782f32ea26027d0ee7063eb6910ffd707fc1aa"},
+ "nkeys": {:hex, :nkeys, "0.3.0", "837add5261a3cdd8ff75b54e0475062313093929ab5e042fa48e010f33b10d16", [:mix], [{:ed25519, "~> 1.3", [hex: :ed25519, repo: "hexpm", optional: false]}, {:kcl, "~> 1.4", [hex: :kcl, repo: "hexpm", optional: false]}], "hexpm", "b5af773a296620ee8eeb1ec6dc5b68f716386f7e53f7bda8c4ac23515823dfe4"},
  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
+ "poly1305": {:hex, :poly1305, "1.0.4", "7cdc8961a0a6e00a764835918cdb8ade868044026df8ef5d718708ea6cc06611", [:mix], [{:chacha20, "~> 1.0", [hex: :chacha20, repo: "hexpm", optional: false]}, {:equivalex, "~> 1.0", [hex: :equivalex, repo: "hexpm", optional: false]}], "hexpm", "e14e684661a5195e149b3139db4a1693579d4659d65bba115a307529c47dbc3b"},
  "propcheck": {:hex, :propcheck, "1.4.1", "c12908dbe6f572032928548089b34ff9d40672d5d70f1562e3a9e9058d226cc9", [:mix], [{:libgraph, "~> 0.13", [hex: :libgraph, repo: "hexpm", optional: false]}, {:proper, "~> 1.4", [hex: :proper, repo: "hexpm", optional: false]}], "hexpm", "e1b088f574785c3c7e864da16f39082d5599b3aaf89086d3f9be6adb54464b19"},
  "proper": {:hex, :proper, "1.4.0", "89a44b8c39d28bb9b4be8e4d715d534905b325470f2e0ec5e004d12484a79434", [:rebar3], [], "hexpm", "18285842185bd33efbda97d134a5cb5a0884384db36119fee0e3cfa488568cbb"},
+ "salsa20": {:hex, :salsa20, "1.0.4", "404cbea1fa8e68a41bcc834c0a2571ac175580fec01cc38cc70c0fb9ffc87e9b", [:mix], [], "hexpm", "745ddcd8cfa563ddb0fd61e7ce48d5146279a2cf7834e1da8441b369fdc58ac6"},
  "telemetry": {:hex, :telemetry, "1.0.0", "0f453a102cdf13d506b7c0ab158324c337c41f1cc7548f0bc0e130bbf0ae9452", [:rebar3], [], "hexpm", "73bc09fa59b4a0284efb4624335583c528e07ec9ae76aca96ea0673850aec57a"},
 }

test/jetstream/api/kv_test.exs

@@ -18,19 +18,19 @@ defmodule Gnat.Jetstream.API.KVTest do
  end
 
  test "creates a bucket with duplicate window < 2min" do
- assert {:ok, %{config: config}} = KV.create_bucket(:gnat, "TTL_TEST", ttl: 100_000_000)
- assert config.max_age == 100_000_000
- assert config.duplicate_window == 100_000_000
+ assert {:ok, %{config: config}} = KV.create_bucket(:gnat, "TTL_TEST", ttl: 1_000_000_000)
+ assert config.max_age == 1_000_000_000
+ assert config.duplicate_window == 1_000_000_000
 
  assert :ok = KV.delete_bucket(:gnat, "TTL_TEST")
  end
 
  test "creates a bucket with duplicate window > 2min" do
  assert {:ok, %{config: config}} =
- KV.create_bucket(:gnat, "OTHER_TTL_TEST", ttl: 1_300_000_000)
+ KV.create_bucket(:gnat, "OTHER_TTL_TEST", ttl: 130_000_000_000)
 
- assert config.max_age == 1_300_000_000
- assert config.duplicate_window == 1_200_000_000
+ assert config.max_age == 130_000_000_000
+ assert config.duplicate_window == 120_000_000_000
 
  assert :ok = KV.delete_bucket(:gnat, "OTHER_TTL_TEST")
  end

test/support/generators.ex

@@ -3,13 +3,13 @@ defmodule Gnat.Generators do
 
  # Character classes useful for generating text
  def alphanumeric_char do
- elements('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+ elements(~c"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
  end
  def alphanumeric_space_char do
- elements(' 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+ elements(~c" 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
  end
  def numeric_char do
- elements('0123456789')
+ elements(~c"0123456789")
  end
 
  @doc "protocol delimiter. The protocol can use one ore more of space or tab characters as delimiters between fields"

test/test_helper.exs

@@ -17,7 +17,7 @@ end)
 :ok = Gnat.stop(conn)
 
 
-case :gen_tcp.connect('localhost', 4222, [:binary]) do
+case :gen_tcp.connect(~c"localhost", 4222, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -135,7 +135,7 @@ defmodule CheckForExpectedNatsServers do
  end
 
  def check_for_default do
- case :gen_tcp.connect('localhost', 4222, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4222, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -147,7 +147,7 @@ defmodule CheckForExpectedNatsServers do
  end
 
  def check_for_tag(:multi_server) do
- case :gen_tcp.connect('localhost', 4223, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4223, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -160,7 +160,7 @@ defmodule CheckForExpectedNatsServers do
  "--user bob --pass alice`."
  end
 
- case :gen_tcp.connect('localhost', 4224, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4224, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -174,7 +174,7 @@ defmodule CheckForExpectedNatsServers do
  "--tlskey test/fixtures/server-key.pem`."
  end
 
- case :gen_tcp.connect('localhost', 4225, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4225, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -189,7 +189,7 @@ defmodule CheckForExpectedNatsServers do
  "--tlscacert test/fixtures/ca.pem --tlsverify"
  end
 
- case :gen_tcp.connect('localhost', 4226, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4226, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->
@@ -202,7 +202,7 @@ defmodule CheckForExpectedNatsServers do
  "--auth SpecialToken`."
  end
 
- case :gen_tcp.connect('localhost', 4227, [:binary]) do
+ case :gen_tcp.connect(~c"localhost", 4227, [:binary]) do
  {:ok, socket} ->
  :gen_tcp.close(socket)
  {:error, reason} ->