Merge branch 'duxinyan' into dev

test/identity/augmentation/pubUnique_test.exs

@@ -6,23 +6,77 @@ defmodule Identity.Augmentation.PubUniqueTest do
 
   doctest Index.Augmentation.IIndex
 
-  # TODO : remove calls to function Index.Generation.add_identity
-
   setup_all do
-    local_iindex = :ets.new(:local_iindex, [:set, :protected])
-    local_mindex = :ets.new(:local_mindex, [:set, :protected])
-
-    Index.Generation.add_identity("blockstamp_test", local_iindex, local_mindex, %{
-      "pub" => "pub_toto",
-      "block_uid" => "block_uid_test",
-      "user_id" => "user_id_toto"
-    })
-
-    Index.Generation.add_identity("blockstamp_test", local_iindex, local_mindex, %{
-      "pub" => "pub_tata",
-      "block_uid" => "block_uid_test",
-      "user_id" => "user_id_tata"
-    })
+    local_iindex = :ets.new(:"test/local_iindex", [:set, :protected])
+    local_mindex = :ets.new(:"test/local_mindex", [:set, :protected])
+
+    :ets.insert(
+      local_iindex,
+      {"pub_toto",
+       %{
+         created_on: "block_uid_test",
+         kick: false,
+         member: true,
+         op: "CREATE",
+         pub: "pub_toto",
+         uid: "user_id_toto",
+         wasMember: true,
+         written_on: "blockstamp_test"
+       }}
+    )
+
+    :ets.insert(
+      local_mindex,
+      {"pub_toto",
+       %{
+         chainable_on: 20,
+         created_on: "block_uid_test",
+         expired_on: 0,
+         expires_on: 20,
+         leaving: false,
+         op: "CREATE",
+         pub: "pub_toto",
+         revocation: nil,
+         revoked_on: nil,
+         revokes_on: 30,
+         type: "JOIN",
+         written_on: "blockstamp_test"
+       }}
+    )
+
+    :ets.insert(
+      local_iindex,
+      {"pub_tata",
+       %{
+         created_on: "block_uid_test",
+         kick: false,
+         member: true,
+         op: "CREATE",
+         pub: "pub_tata",
+         uid: "user_id_tata",
+         wasMember: true,
+         written_on: "blockstamp_test"
+       }}
+    )
+
+    :ets.insert(
+      local_mindex,
+      {"pub_tata",
+       %{
+         chainable_on: 20,
+         created_on: "block_uid_test",
+         expired_on: 0,
+         expires_on: 20,
+         leaving: false,
+         op: "CREATE",
+         pub: "pub_tata",
+         revocation: nil,
+         revoked_on: nil,
+         revokes_on: 30,
+         type: "JOIN",
+         written_on: "blockstamp_test"
+       }}
+    )
 
     {:ok, global_iindex} = :dets.open_file(:"test/global_iindex", type: :set)
     :ets.to_dets(local_iindex, global_iindex)

test/identity/augmentation/uidUnique_test.exs

@@ -6,34 +6,53 @@ defmodule Identity.Augmentation.UidUniqueTest do
 
   doctest Index.Augmentation.IIndex
 
-  # TODO : remove calls to function Index.Generation.add_identity
-
   setup_all do
-    local_iindex_a = :ets.new(:local_iindex, [:set, :protected])
-    local_iindex_b = :ets.new(:local_iindex, [:set, :protected])
-    local_mindex_a = :ets.new(:local_mindex, [:set, :protected])
-    local_mindex_b = :ets.new(:local_mindex, [:set, :protected])
-
-    Index.Generation.add_identity("blockstamp_test", local_iindex_a, local_mindex_a, %{
-      "pub" => "pub_toto",
-      "block_uid" => "block_uid_test",
-      "user_id" => "user_id_test"
-    })
-
-    Index.Generation.add_identity("blockstamp_test", local_iindex_b, local_mindex_b, %{
-      "pub" => "pub_toto",
-      "block_uid" => "block_uid_test",
-      "user_id" => "user_id_test"
-    })
-
-    {:ok, global_iindex_a} = :dets.open_file(:global_iindex_a, type: :set)
-    {:ok, global_iindex_b} = :dets.open_file(:global_iindex_b, type: :set)
-    :ets.to_dets(local_iindex_a, :global_iindex_a)
-    :ets.to_dets(local_iindex_b, :global_iindex_b)
-
-    [{"pub_toto", elt}] = :dets.lookup(:global_iindex_b, "pub_toto")
+
+    local_iindex_a = :ets.new(:"test/local_iindex", [:set, :protected])
+    local_iindex_b = :ets.new(:"test/local_iindex", [:set, :protected])
+    local_mindex_a = :ets.new(:"test/local_mindex", [:set, :protected])
+    local_mindex_b = :ets.new(:"test/local_mindex", [:set, :protected])
+
+
+    new_entry = %{
+      op: "CREATE",
+      uid: "user_id_test",
+      pub: "pub_toto",
+      created_on: "block_uid_test",
+      written_on: "blockstamp_test",
+      member: true,
+      wasMember: true,
+      kick: false
+    }
+    :ets.insert(local_iindex_a, {"pub_toto", new_entry})
+    :ets.insert(local_iindex_b, {"pub_toto", new_entry})
+
+    new_entry_1 = %{
+      op: "CREATE",
+      pub: "pub_toto",
+      created_on: "block_uid_test",
+      written_on: "blockstamp_test",
+      expired_on: 0,
+      expires_on: Constants.medianTime() + Constants.msValidity(),
+      revokes_on: Constants.medianTime() + Constants.msValidity() * 2,
+      chainable_on: Constants.medianTime() + Constants.msPeriod(),
+      type: "JOIN",
+      revocation: nil,
+      revoked_on: nil,
+      leaving: false
+    }
+    :ets.insert(local_mindex_a, {"pub_toto", new_entry_1})
+    :ets.insert(local_mindex_b, {"pub_toto", new_entry_1})
+
+    {:ok, global_iindex_a} = :dets.open_file(:"test/global_iindex_a", type: :set)
+    {:ok, global_iindex_b} = :dets.open_file(:"test/global_iindex_b", type: :set)
+
+    :ets.to_dets(local_iindex_a, global_iindex_a)
+    :ets.to_dets(local_iindex_b, global_iindex_b)
+
+    [{"pub_toto", elt}] = :dets.lookup(global_iindex_b, "pub_toto")
     new_elt = Map.replace!(elt, :uid, "user_id_test_2")
-    :dets.insert(:global_iindex_b, {"pub_toto", new_elt})
+    :dets.insert(global_iindex_b, {"pub_toto", new_elt})
 
     Index.Augmentation.IIndex.uidUnique(local_iindex_a, global_iindex_a, "pub_toto")
     Index.Augmentation.IIndex.uidUnique(local_iindex_b, global_iindex_b, "pub_toto")
@@ -41,9 +60,9 @@ defmodule Identity.Augmentation.UidUniqueTest do
     [{"pub_toto", b}] = :ets.lookup(local_iindex_b, "pub_toto")
 
     :dets.close(global_iindex_a)
-    :file.delete("global_iindex_a")
     :dets.close(global_iindex_b)
-    :file.delete("global_iindex_b")
+    :file.delete("test/global_iindex_a")
+    :file.delete("test/global_iindex_b")
 
     {:ok, uid_unique_a: a.uidUnique, uid_unique_b: b.uidUnique}
   end