Skip to content

Commit 2846256

Browse files
author
hydepwns
committed
fix: resolve Elixir test syntax error, Docker build path, and remove invalid Gleam manifest
1 parent e99a67b commit 2846256

4 files changed

Lines changed: 39 additions & 50 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,10 @@ install: build
198198
# Docker targets
199199
docker-build:
200200
@echo "Building Docker images..."
201-
docker build --target erlang-build -t libsignal-protocol-nif:erlang .
202-
docker build --target elixir-build -t libsignal-protocol-nif:elixir .
203-
docker build --target gleam-build -t libsignal-protocol-nif:gleam .
204-
docker build --target production -t libsignal-protocol-nif:latest .
201+
docker build --target erlang-build -t libsignal-protocol-nif:erlang -f docker/Dockerfile .
202+
docker build --target elixir-build -t libsignal-protocol-nif:elixir -f docker/Dockerfile .
203+
docker build --target gleam-build -t libsignal-protocol-nif:gleam -f docker/Dockerfile .
204+
docker build --target production -t libsignal-protocol-nif:latest -f docker/Dockerfile .
205205

206206
docker-test:
207207
@echo "Running tests in Docker..."

‎scripts/release.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ make perf-test
101101

102102
# Build Docker images
103103
log_info "Building Docker images..."
104-
docker build --target erlang-build -t "$DOCKER_IMAGE:erlang-$NEW_VERSION" .
105-
docker build --target elixir-build -t "$DOCKER_IMAGE:elixir-$NEW_VERSION" .
106-
docker build --target gleam-build -t "$DOCKER_IMAGE:gleam-$NEW_VERSION" .
107-
docker build --target production -t "$DOCKER_IMAGE:$NEW_VERSION" .
104+
docker build --target erlang-build -t "$DOCKER_IMAGE:erlang-$NEW_VERSION" -f docker/Dockerfile .
105+
docker build --target elixir-build -t "$DOCKER_IMAGE:elixir-$NEW_VERSION" -f docker/Dockerfile .
106+
docker build --target gleam-build -t "$DOCKER_IMAGE:gleam-$NEW_VERSION" -f docker/Dockerfile .
107+
docker build --target production -t "$DOCKER_IMAGE:$NEW_VERSION" -f docker/Dockerfile .
108108
docker tag "$DOCKER_IMAGE:$NEW_VERSION" "$DOCKER_IMAGE:$DOCKER_TAG"
109109

110110
# Update changelog

‎wrappers/elixir/test/pre_key_bundle_test.exs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
1212
test "creates a valid pre-key bundle" do
1313
# Generate identity keys
1414
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
15-
15+
1616
# Generate pre-key components
1717
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
18-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
18+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
1919
:nif.generate_signed_pre_key(identity_key, 67890)
2020

2121
# Create pre-key bundle
@@ -38,18 +38,18 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
3838
test "creates bundles with different parameters" do
3939
{:ok, {identity_key1, _}} = :nif.generate_identity_key_pair()
4040
{:ok, {identity_key2, _}} = :nif.generate_identity_key_pair()
41-
41+
4242
{:ok, {pre_key_id1, pre_key_public1}} = :nif.generate_pre_key(11111)
4343
{:ok, {pre_key_id2, pre_key_public2}} = :nif.generate_pre_key(22222)
44-
45-
{:ok, {signed_pre_key_id1, signed_pre_key_public1, signature1}} =
44+
45+
{:ok, {signed_pre_key_id1, signed_pre_key_public1, signature1}} =
4646
:nif.generate_signed_pre_key(identity_key1, 33333)
47-
{:ok, {signed_pre_key_id2, signed_pre_key_public2, signature2}} =
47+
{:ok, {signed_pre_key_id2, signed_pre_key_public2, signature2}} =
4848
:nif.generate_signed_pre_key(identity_key2, 44444)
4949

50-
bundle1 = PreKeyBundle.create(100, 200, {pre_key_id1, pre_key_public1},
50+
bundle1 = PreKeyBundle.create(100, 200, {pre_key_id1, pre_key_public1},
5151
{signed_pre_key_id1, signed_pre_key_public1, signature1}, identity_key1)
52-
bundle2 = PreKeyBundle.create(300, 400, {pre_key_id2, pre_key_public2},
52+
bundle2 = PreKeyBundle.create(300, 400, {pre_key_id2, pre_key_public2},
5353
{signed_pre_key_id2, signed_pre_key_public2, signature2}, identity_key2)
5454

5555
assert bundle1 != bundle2
@@ -62,17 +62,17 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
6262
test "handles edge cases" do
6363
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
6464
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(0)
65-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
65+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
6666
:nif.generate_signed_pre_key(identity_key, 0)
6767

6868
# Test with zero values
69-
bundle = PreKeyBundle.create(0, 0, {pre_key_id, pre_key_public},
69+
bundle = PreKeyBundle.create(0, 0, {pre_key_id, pre_key_public},
7070
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
7171
assert bundle.registration_id == 0
7272
assert bundle.device_id == 0
7373

7474
# Test with large values
75-
large_bundle = PreKeyBundle.create(16#FFFFFFFF, 16#FFFFFFFF, {pre_key_id, pre_key_public},
75+
large_bundle = PreKeyBundle.create(16#FFFFFFFF, 16#FFFFFFFF, {pre_key_id, pre_key_public},
7676
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
7777
assert large_bundle.registration_id == 16#FFFFFFFF
7878
assert large_bundle.device_id == 16#FFFFFFFF
@@ -83,11 +83,11 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
8383
test "parses valid pre-key bundle binary" do
8484
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
8585
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
86-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
86+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
8787
:nif.generate_signed_pre_key(identity_key, 67890)
8888

8989
# Create bundle
90-
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
90+
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
9191
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
9292

9393
# Convert to binary format (simulate what would be sent over network)
@@ -112,8 +112,8 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
112112
:erlang.term_to_binary({invalid, data}),
113113
:erlang.term_to_binary([]),
114114
:erlang.term_to_binary(123),
115-
<<0:1024>>, # Large zero-filled binary
116-
<<255:1024>> # Large filled binary
115+
:crypto.strong_rand_bytes(128), # Large zero-filled binary
116+
:crypto.strong_rand_bytes(128) # Large filled binary
117117
]
118118

119119
Enum.each(invalid_binaries, fn invalid_binary ->
@@ -127,13 +127,13 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
127127
test "parses bundles with different structures" do
128128
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
129129
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
130-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
130+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
131131
:nif.generate_signed_pre_key(identity_key, 67890)
132132

133133
# Test different bundle structures
134-
bundle1 = PreKeyBundle.create(100, 200, {pre_key_id, pre_key_public},
134+
bundle1 = PreKeyBundle.create(100, 200, {pre_key_id, pre_key_public},
135135
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
136-
bundle2 = PreKeyBundle.create(300, 400, {pre_key_id, pre_key_public},
136+
bundle2 = PreKeyBundle.create(300, 400, {pre_key_id, pre_key_public},
137137
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
138138

139139
binary1 = :erlang.term_to_binary(bundle1)
@@ -153,10 +153,10 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
153153
test "verifies valid signatures" do
154154
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
155155
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
156-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
156+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
157157
:nif.generate_signed_pre_key(identity_key, 67890)
158158

159-
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
159+
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
160160
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
161161

162162
case PreKeyBundle.verify_signature(bundle) do
@@ -169,10 +169,10 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
169169
test "rejects invalid signatures" do
170170
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
171171
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
172-
172+
173173
# Create bundle with invalid signature
174174
invalid_signature = "invalid_signature"
175-
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
175+
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
176176
{67890, pre_key_public, invalid_signature}, identity_key)
177177

178178
case PreKeyBundle.verify_signature(bundle) do
@@ -188,9 +188,9 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
188188
%{registration_id: 123},
189189
%{registration_id: 123, device_id: 456},
190190
%{registration_id: 123, device_id: 456, pre_key: {0, "invalid"}},
191-
%{registration_id: 123, device_id: 456, pre_key: {0, "invalid"},
191+
%{registration_id: 123, device_id: 456, pre_key: {0, "invalid"},
192192
signed_pre_key: {0, "invalid", "invalid"}},
193-
%{registration_id: 123, device_id: 456, pre_key: {0, "invalid"},
193+
%{registration_id: 123, device_id: 456, pre_key: {0, "invalid"},
194194
signed_pre_key: {0, "invalid", "invalid"}, identity_key: "invalid"}
195195
]
196196

@@ -208,11 +208,11 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
208208
test "full bundle lifecycle" do
209209
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
210210
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
211-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
211+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
212212
:nif.generate_signed_pre_key(identity_key, 67890)
213213

214214
# Create bundle
215-
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
215+
bundle = PreKeyBundle.create(123, 456, {pre_key_id, pre_key_public},
216216
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
217217

218218
# Verify signature
@@ -242,7 +242,7 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
242242
# Generate pre-key components for each
243243
bundles = Enum.map([identity_key1, identity_key2, identity_key3], fn identity_key ->
244244
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(:rand.uniform(100000))
245-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
245+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
246246
:nif.generate_signed_pre_key(identity_key, :rand.uniform(100000))
247247

248248
PreKeyBundle.create(
@@ -260,7 +260,7 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
260260
# Test parse and verify for each bundle
261261
Enum.each(bundles, fn bundle ->
262262
bundle_binary = :erlang.term_to_binary(bundle)
263-
263+
264264
case PreKeyBundle.parse(bundle_binary) do
265265
{:ok, parsed_bundle} ->
266266
assert parsed_bundle.registration_id == bundle.registration_id
@@ -317,11 +317,11 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
317317
test "handles large data" do
318318
{:ok, {identity_key, _}} = :nif.generate_identity_key_pair()
319319
{:ok, {pre_key_id, pre_key_public}} = :nif.generate_pre_key(12345)
320-
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
320+
{:ok, {signed_pre_key_id, signed_pre_key_public, signature}} =
321321
:nif.generate_signed_pre_key(identity_key, 67890)
322322

323323
# Test with large registration and device IDs
324-
bundle = PreKeyBundle.create(16#FFFFFFFF, 16#FFFFFFFF, {pre_key_id, pre_key_public},
324+
bundle = PreKeyBundle.create(16#FFFFFFFF, 16#FFFFFFFF, {pre_key_id, pre_key_public},
325325
{signed_pre_key_id, signed_pre_key_public, signature}, identity_key)
326326

327327
assert bundle.registration_id == 16#FFFFFFFF
@@ -337,4 +337,4 @@ defmodule LibsignalProtocol.PreKeyBundleTest do
337337
end
338338
end
339339
end
340-
end
340+
end

‎wrappers/gleam/manifest.toml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)