Bump lasp.

rebar.config

@@ -1,4 +1,7 @@
-{deps, [{lasp, {git, "https://github.com/lasp-lang/lasp", {tag, "unstable"}}}]}.
+{deps, [
+  {lasp, {git, "https://github.com/lasp-lang/lasp", {branch, "master"}}},
+  {partisan, {git, "https://github.com/lasp-lang/partisan", {branch, "master"}}}
+  ]}.
 
 {dialyzer_base_plt_apps, [kernel, stdlib, erts, sasl, eunit, syntax_tools, compiler, crypto]}.
 {xref_checks, [undefined_function_calls]}.

rebar.lock

@@ -1,68 +1,30 @@
 {"1.1.0",
-[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0-rc.0">>},2},
- {<<"eini">>,{pkg,<<"eini">>,<<"1.2.4">>},2},
- {<<"erlcloud">>,{pkg,<<"erlcloud">>,<<"2.0.4">>},1},
- {<<"gb_trees_ext">>,
-  {git,"https://github.com/lasp-lang/gb_trees_ext",
-       {ref,"dba0bbc4bc55d4f062e0bf5c0b807a4eb915e934"}},
-  1},
- {<<"gen_flow">>,
-  {git,"https://github.com/lasp-lang/gen_flow",
-       {ref,"9a4d374e8083e9881a50b0d1f5d5497f7b8c6987"}},
-  1},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.8">>},2},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.0">>},1},
- {<<"lager">>,{pkg,<<"lager">>,<<"3.2.1">>},1},
+[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0-rc.0">>},1},
+ {<<"gen_flow">>,{pkg,<<"gen_flow">>,<<"0.0.4">>},1},
+ {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2},
+ {<<"lager">>,{pkg,<<"lager">>,<<"3.5.1">>},1},
  {<<"lasp">>,
   {git,"https://github.com/lasp-lang/lasp",
-       {ref,"832e98e70df22677f17c730d29b9de193370705e"}},
+       {ref,"ac0c2688976b88bdb37f3e252e973f1a5a04bea8"}},
   0},
- {<<"lasp_support">>,
-  {git,"https://github.com/lasp-lang/lasp_support",
-       {ref,"f5b72230e04a16a511f30cef22cdda1204cd7585"}},
-  1},
- {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.4.0">>},2},
- {<<"mochiweb">>,{pkg,<<"mochiweb">>,<<"2.12.2">>},2},
+ {<<"lasp_support">>,{pkg,<<"lasp_support">>,<<"0.0.3">>},1},
  {<<"partisan">>,
   {git,"https://github.com/lasp-lang/partisan",
-       {ref,"5fbd47fbff4df7664ef9a5626819e0dcf3436d1b"}},
-  1},
- {<<"plumtree">>,
-  {git,"https://github.com/lasp-lang/plumtree",
-       {ref,"709275b63b60bb5df5bd3705dcd9e268dca98982"}},
-  1},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.2.1">>},1},
- {<<"rand_compat">>,
-  {git,"https://github.com/lasp-lang/rand_compat",
-       {ref,"4f658110f57bfd1a3e966a7d65b23d5c8f868167"}},
-  1},
- {<<"riak_dt">>,
-  {git,"git://github.com/helium/riak_dt.git",
-       {ref,"15d66cb26c2028c1ad1271c359b1d5da213825c3"}},
-  2},
- {<<"sext">>,{pkg,<<"sext">>,<<"1.4.0">>},1},
- {<<"time_compat">>,
-  {git,"https://github.com/lasp-lang/time_compat",
-       {ref,"6007f68892104ebb6fa2366cebf9d928d8856273"}},
-  1},
- {<<"types">>,
-  {git,"https://github.com/lasp-lang/types",
-       {ref,"393e6a360302a6a374d5f77615af3f3a93959deb"}},
-  1},
- {<<"webmachine">>,
-  {git,"https://github.com/webmachine/webmachine",
-       {ref,"8f1e4336771e96e24f4d046b671d42289b5113a7"}},
-  1}]}.
+       {ref,"59996c7c31416af0c8cf4242944e3a27c68ab8b4"}},
+  0},
+ {<<"plumtree">>,{pkg,<<"plumtree">>,<<"0.4.0">>},1},
+ {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},1},
+ {<<"time_compat">>,{pkg,<<"time_compat">>,<<"0.0.1">>},1},
+ {<<"types">>,{pkg,<<"types">>,<<"0.1.6">>},1}]}.
 [
 {pkg_hash,[
  {<<"acceptor_pool">>, <<"679D741DF87FC13599B1AEF2DF8F78F1F880449A6BEFAB7C44FB6FAE0E92A2DE">>},
- {<<"eini">>, <<"ABD64A0533398A6D714D21219BB85F2D41FDB42665AC4080939B7BFA8E55F386">>},
- {<<"erlcloud">>, <<"02B404335B19AE125424805467C7F94D3EF755B4E06EBF281438D2D41CD0F820">>},
- {<<"goldrush">>, <<"2024BA375CEEA47E27EA70E14D2C483B2D8610101B4E852EF7F89163CDB6E649">>},
- {<<"jsx">>, <<"749BEC6D205C694AE1786D62CEA6CC45A390437E24835FD16D12D74F07097727">>},
- {<<"lager">>, <<"EEF4E18B39E4195D37606D9088EA05BF1B745986CF8EC84F01D332456FE88D17">>},
- {<<"lhttpc">>, <<"61760AFEC1DDB98E47972BE93B13FBFF487A63D65B91A02C41122A0ADF83DA38">>},
- {<<"mochiweb">>, <<"80804AD342AFA3D7F3524040D4EED66CE74B17A555DE454AC85B07C479928E46">>},
- {<<"ranch">>, <<"A6FB992C10F2187B46FFD17CE398DDF8A54F691B81768F9EF5F461EA7E28C762">>},
- {<<"sext">>, <<"2A9443A90C3164231A5E11C73133C4B1762B27FBF1647AA0DE06EF565C47B38B">>}]}
+ {<<"gen_flow">>, <<"E5F401967B2EE073EA4635AC8E98CC68139115473B036CC7220BB62AE4A78F2C">>},
+ {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
+ {<<"lager">>, <<"63897A61AF646C59BB928FEE9756CE8BDD02D5A1A2F3551D4A5E38386C2CC071">>},
+ {<<"lasp_support">>, <<"C1B7E1A472037AE82C71D2D16A10B7D644A621B66AE5AFE834CECF170F2E9169">>},
+ {<<"plumtree">>, <<"14E9E28C81FA03F1BDC544EA27BD1969E66ED106725A5042DAA40C5F7B246DBF">>},
+ {<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>},
+ {<<"time_compat">>, <<"23FE0AD1FDF3B5B88821B2D04B4B5E865BF587AE66056D671FE0F53514ED8139">>},
+ {<<"types">>, <<"03BB7140016C896D3441A77CB0B7D6ACAA583D6D6E9C4A3E1FD3C25123710290">>}]}
 ].

test/lasp_pg_SUITE.erl

@@ -96,7 +96,7 @@ default_manager_test(Config) ->
                    {clients, Clients}]),
 
     %% Pause for clustering.
-    timer:sleep(1000),
+    timer:sleep(5000),
 
     %% Verify membership.
     %%
@@ -234,7 +234,7 @@ default_manager_test(Config) ->
     %% Wait anti-entropy interval.
     timer:sleep(5000),
 
-    %% Verify join propagates back to node 1.
+    %% Verify join propagates back to node 1    .
     {ok, EncodedMembers2} = rpc:call(Node1, lasp_pg, members, [Group]),
     Members2 = sets:to_list(EncodedMembers2),
     ct:pal("Members on node ~p after join is ~p", [Node1, Members2]),
@@ -471,10 +471,10 @@ cluster({Name, _Node} = Myself, Nodes, Options, Config) when is_list(Nodes) ->
                  end,
     lists:map(fun(OtherNode) -> cluster(Myself, OtherNode, Config) end, OtherNodes).
 cluster({_, Node}, {_, OtherNode}, Config) ->
-    PeerPort = rpc:call(OtherNode,
+    ListenAddrs = rpc:call(OtherNode,
                         partisan_config,
                         get,
-                        [peer_port, ?PEER_PORT]),
+                        [listen_addrs]),
     Parallelism = case ?config(parallelism, Config) of
                       undefined ->
                           1;
@@ -485,20 +485,20 @@ cluster({_, Node}, {_, OtherNode}, Config) ->
                       undefined ->
                           [];
                       C ->
-                          C
+                         C 
                   end,
     JoinMethod = case ?config(sync_join, Config) of
                   undefined ->
                       join;
                   true ->
                       sync_join
                   end,
-    ct:pal("Joining node: ~p to ~p at port ~p", [Node, OtherNode, PeerPort]),
+    ct:pal("Joining node: ~p to ~p at port ~p", [Node, OtherNode, ListenAddrs]),
     ok = rpc:call(Node,
                   partisan_peer_service,
                   JoinMethod,
                   [#{name => OtherNode,
-                     listen_addrs => [#{ip => {127, 0, 0, 1}, port => PeerPort}],
+                     listen_addrs => ListenAddrs,
                      channels => Channels,
                      parallelism => Parallelism}]).