Fix tests

helium · Jan 9, 2020 · 703b034 · 703b034
1 parent 2433cc5
commit 703b034
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/src/blockchain.erl b/src/blockchain.erl
@@ -1491,6 +1491,11 @@ blocks_test() ->
     meck:expect(blockchain_election, has_new_group, fun(_) ->
         false
     end),
+    meck:new(blockchain_swarm, [passthrough]),
+    meck:expect(blockchain_swarm, pubkey_bin, fun() ->
+        crypto:strong_rand_bytes(33)
+    end),
+
     {ok, Pid} = blockchain_lock:start_link(),
 
     #{secret := Priv, public := Pub} = libp2p_crypto:generate_keys(ecc_compact),
@@ -1530,7 +1535,10 @@ blocks_test() ->
     ?assert(meck:validate(blockchain_worker)),
     meck:unload(blockchain_worker),
     ?assert(meck:validate(blockchain_election)),
-    meck:unload(blockchain_election).
+    meck:unload(blockchain_election),
+    ?assert(meck:validate(blockchain_swarm)),
+    meck:unload(blockchain_swarm).
+
 
 
 get_block_test() ->
@@ -1553,7 +1561,10 @@ get_block_test() ->
     meck:expect(blockchain_election, has_new_group, fun(_) ->
         false
     end),
-
+    meck:new(blockchain_swarm, [passthrough]),
+    meck:expect(blockchain_swarm, pubkey_bin, fun() ->
+        crypto:strong_rand_bytes(33)
+    end),
 
     {ok, Pid} = blockchain_lock:start_link(),
 
@@ -1590,7 +1601,9 @@ get_block_test() ->
     ?assert(meck:validate(blockchain_worker)),
     meck:unload(blockchain_worker),
     ?assert(meck:validate(blockchain_election)),
-    meck:unload(blockchain_election).
+    meck:unload(blockchain_election),
+    ?assert(meck:validate(blockchain_swarm)),
+    meck:unload(blockchain_swarm).
 
 
 -endif.
diff --git a/test/blockchain_simple_SUITE.erl b/test/blockchain_simple_SUITE.erl
@@ -77,7 +77,8 @@ init_per_testcase(TestCase, Config) ->
     BaseDir = "data/test_SUITE/" ++ erlang:atom_to_list(TestCase),
     Balance = 5000,
     {ok, Sup, {PrivKey, PubKey}, Opts} = test_utils:init(BaseDir),
-    {ok, GenesisMembers, ConsensusMembers, Keys} = test_utils:init_chain(Balance, {PrivKey, PubKey}),
+    %% two tests rely on the swarm not being in the consensus group, so exclude them here
+    {ok, GenesisMembers, ConsensusMembers, Keys} = test_utils:init_chain(Balance, {PrivKey, PubKey}, not lists:member(TestCase, [bogus_coinbase_test, bogus_coinbase_with_good_payment_test])),
 
     Chain = blockchain_worker:blockchain(),
     Swarm = blockchain_swarm:swarm(),

diff --git a/test/test_utils.erl b/test/test_utils.erl
@@ -5,7 +5,7 @@
 -include("blockchain_vars.hrl").
 
 -export([
-    init/1, init_chain/2,
+    init/1, init_chain/2, init_chain/3,
     generate_keys/1, generate_keys/2,
     wait_until/1, wait_until/3,
     create_block/2,
@@ -30,13 +30,21 @@ init(BaseDir) ->
     ?assert(erlang:is_pid(blockchain_swarm:swarm())),
     {ok, Sup, {PrivKey, PubKey}, Opts}.
 
-init_chain(Balance, {PrivKey, PubKey}) ->
+init_chain(Balance, Keys) ->
+    init_chain(Balance, Keys, true).
+
+init_chain(Balance, {PrivKey, PubKey}, InConsensus) ->
     % Generate fake blockchains (just the keys)
-    RandomKeys = test_utils:generate_keys(10),
-    Address = blockchain_swarm:pubkey_bin(),
-    GenesisMembers = [
-        {Address, {PubKey, PrivKey, libp2p_crypto:mk_sig_fun(PrivKey)}}
-    ] ++ RandomKeys,
+    GenesisMembers = case InConsensus of
+                         true ->
+                             RandomKeys = test_utils:generate_keys(10),
+                             Address = blockchain_swarm:pubkey_bin(),
+                             [
+                              {Address, {PubKey, PrivKey, libp2p_crypto:mk_sig_fun(PrivKey)}}
+                             ] ++ RandomKeys;
+                         false ->
+                             test_utils:generate_keys(11)
+                     end,
 
     % Create genesis block
     {InitialVars, Keys} = blockchain_ct_utils:create_vars(#{}),