diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:04:43 -0600 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:05:36 -0600 |
commit | 80891e83d8df25b742a321d2c837e38c805e6582 (patch) | |
tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /benchmarks | |
parent | 4999efad3f0bb0a70a5be5d5c2b970ab564668ca (diff) | |
parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
download | pleroma-80891e83d8df25b742a321d2c837e38c805e6582.tar.gz pleroma-80891e83d8df25b742a321d2c837e38c805e6582.zip |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/load_testing/users.ex | 4 | ||||
-rw-r--r-- | benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/benchmarks/load_testing/users.ex b/benchmarks/load_testing/users.ex index 6cf3958c1..34a904ac2 100644 --- a/benchmarks/load_testing/users.ex +++ b/benchmarks/load_testing/users.ex @@ -109,8 +109,8 @@ defmodule Pleroma.LoadTesting.Users do end def make_friends(%User{} = main_user, %User{} = user) do - {:ok, _} = User.follow(main_user, user) - {:ok, _} = User.follow(user, main_user) + {:ok, _, _} = User.follow(main_user, user) + {:ok, _, _} = User.follow(user, main_user) end @spec get_users(User.t(), keyword()) :: [User.t()] diff --git a/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex b/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex index 9b7ac6111..aed32f194 100644 --- a/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex +++ b/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex @@ -50,7 +50,7 @@ defmodule Mix.Tasks.Pleroma.Benchmarks.Timelines do ) users - |> Enum.each(fn {:ok, follower} -> Pleroma.User.follow(follower, user) end) + |> Enum.each(fn {:ok, follower, user} -> Pleroma.User.follow(follower, user) end) Benchee.run( %{ |