zf

commit cb1b45e27db65297d49a150ab398d7918f4c2a5a
parent 5e4261927c1b2f60356714b1b7fd3580ae74c09e
Author: Alberto Lerda <albertolerda97@gmail.com>
Date:   Mon,  9 Jan 2023 13:59:01 +0100

typespec fixes

Diffstat:
M
conf/runtime.exs
 | 
2
+-
M
docs/configuration-guide.md
 | 
2
+-
M
src/zenflows/did.ex
 | 
16
+++++++---------
M
src/zenflows/httpc.ex
 | 
2
++
M
src/zenflows/vf/economic_resource/domain.ex
 | 
2
+-

5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/conf/runtime.exs b/conf/runtime.exs
@@ -86,7 +86,7 @@ config :zenflows, Zenflows.Restroom,
 # did
 #
 did_keyring = Base.decode64!(get_env("DID_KEYRING", ""))
-did_uri = get_env_url.("DID_URI", "http://did.dyne.org")
+did_uri = get_env_url.("DID_URI", "https://did.dyne.org")
 config :zenflows, Zenflows.DID,
 	did_uri: did_uri,
 	did_keyring: if(did_keyring == "", do: nil, else: Jason.decode!(did_keyring))
diff --git a/docs/configuration-guide.md b/docs/configuration-guide.md
@@ -40,7 +40,7 @@ also see the [Required Options](#required-options).
 * `ROOM_SALT`: The base64-encoded salt to be used with Restroom's
   keypairoomServer call.
 
-* `DID_URI`: The URI of the DID controller instance. Defaults to `http://did.dyne.org`.
+* `DID_URI`: The URI of the DID controller instance. Defaults to `https://did.dyne.org`.
 * `DID_KEYRING`: Keyring (identity) of the server, it is not defined
   communication with DID controller is disabled.
 
diff --git a/src/zenflows/did.ex b/src/zenflows/did.ex
@@ -40,7 +40,7 @@ defp exec(name, post_data) do
 		"/v1/sandbox/#{name}", post_data)
 end
 
-@spec get_did(Person.t()) :: String.t()
+@spec did_id(Person.t()) :: String.t()
 defp did_id(person) do
 	"did:dyne:ifacer:#{person.eddsa_public_key}"
 end
@@ -49,15 +49,13 @@ end
 def get_did(person) do
 	with {:ok, %{status: stat, data: body}} when stat == 200 <-
 			Zenflows.HTTPC.request(__MODULE__, "GET",
-				"/dids/#{did_id(person)}"),
-		{:ok, data} <- Jason.decode(body) do
-		{:ok, %{"created" => false, "did" => data}}
+				"/dids/#{did_id(person)}") do
+		case Jason.decode(body) do
+			{:ok, data} -> {:ok, %{"created" => false, "did" => data}}
+			{:error, err} -> {:error, err}
+		end
 	else
-		err ->
-			case err do
-				{:ok, _} -> {:error, "DID not found"}
-				{:error, err} -> {:error, err}
-			end
+		_err -> {:error, "DID not found"}
 	end
 end
 
diff --git a/src/zenflows/httpc.ex b/src/zenflows/httpc.ex
@@ -18,6 +18,8 @@ def start_link(opts) do
 	GenServer.start_link(__MODULE__, {scheme, host, port}, name: name)
 end
 
+@spec request(term(), term(), term(), term())
+	:: {:ok, term()} | {:error, term()}
 def request(name, method, path, headers \\ [], body \\ nil, max \\ 5) do
 	headers =
 		case :lists.keyfind("user-agent", 1, headers) do
diff --git a/src/zenflows/vf/economic_resource/domain.ex b/src/zenflows/vf/economic_resource/domain.ex
@@ -301,7 +301,7 @@ def trace_dpp_ee_before_recurse(%EconomicResource{} = item, visited, depth) do
 	trace_dpp_er_before(item, visited, depth)
 end
 def trace_dpp_ee_before_recurse(%EconomicEvent{} = item, visited, depth) do
-	trace_dpp_pr_before(item, MapSet.put(visited, {item.__struct__, item.id}), depth)
+	trace_dpp_ee_before(item, MapSet.put(visited, {item.__struct__, item.id}), depth)
 end
 def trace_dpp_ee_before_recurse(%Process{} = item, visited, depth) do
 	trace_dpp_pr_before(item, MapSet.put(visited, {item.__struct__, item.id}), depth)