Merge pull request #160 from EOSIO/nathan-misc

Ref #91: Fix ordered_non_unique index
EOSIO · Aug 15, 2017 · ae26e96 · ae26e96
2 parents 5819d26 + 9d4384a
commit ae26e96
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libraries/chain/include/eos/chain/producer_object.hpp b/libraries/chain/include/eos/chain/producer_object.hpp
@@ -49,8 +49,12 @@ using producer_multi_index = chainbase::shared_multi_index_container<
    indexed_by<
       ordered_unique<tag<by_id>, member<producer_object, producer_object::id_type, &producer_object::id>>,
       ordered_unique<tag<by_owner>, member<producer_object, AccountName, &producer_object::owner>>,
-#warning using ordered_non_unique is not deterministic
-      ordered_non_unique<tag<by_key>, member<producer_object, public_key_type, &producer_object::signing_key>>
+      ordered_unique<tag<by_key>,
+         composite_key<producer_object,
+            member<producer_object, public_key_type, &producer_object::signing_key>,
+            member<producer_object, producer_object::id_type, &producer_object::id>
+         >
+      >
    >
 >;