Remove keymaster; update dep

src/gd_con.erl

@@ -831,7 +831,9 @@ do_make_key2(Name, Bin, Transform,
     #wallet{name = WalletName, poas = POAs, keys = Keys} = Current,
     T = transform(Transform),
     Seed = T(Bin),
-    Key = #key{name = KeyName, id = ID} = gd_key_master:make_key(Name, Seed),
+    {ID, Pair} = hz_key_master:make_key(Seed),
+    KeyName = case Name =:= "" of true -> ID; false -> Name end,
+    Key = #key{name = KeyName, id = ID, pair = Pair},
     POA = #poa{name = KeyName, id = ID},
     NewKeys = [Key | Keys],
     NewPOAs = [POA | POAs],
@@ -870,7 +872,7 @@ t_xor(B, A) ->
 
 
 do_recover_key(Mnemonic, State) ->
-    case gd_key_master:decode(Mnemonic) of
+    case hz_key_master:decode(Mnemonic) of
         {ok, Seed} ->
             do_recover_key2(Seed, State);
         Error ->
@@ -880,7 +882,7 @@ do_recover_key(Mnemonic, State) ->
 
 do_recover_key2(Seed, State = #s{wallet = Current, wallets = Wallets, pass = Pass}) ->
     #wallet{name = WalletName, keys = Keys, poas = POAs} = Current,
-    Recovered = #key{id = ID, name = AccName} = gd_key_master:make_key("", Seed),
+    Recovered = #key{id = ID, name = AccName} = hz_key_master:make_key("", Seed),
     case lists:keymember(ID, #key.id, Keys) of
         false ->
             NewKeys = [Recovered | Keys],
@@ -899,7 +901,7 @@ do_recover_key2(Seed, State = #s{wallet = Current, wallets = Wallets, pass = Pas
 do_mnemonic(ID, #s{wallet = #wallet{keys = Keys}}) ->
     case lists:keyfind(ID, #key.id, Keys) of
         #key{pair = #{secret := <<K:32/binary, _/binary>>}} ->
-            Mnemonic = gd_key_master:encode(K),
+            Mnemonic = hz_key_master:encode(K),
             {ok, Mnemonic};
         false ->
             {error, bad_key}