Restructure the identity contract to match the structure used in the example contract

identity-contract/CMakeLists.txt

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+INCLUDE(family.cmake)
 INCLUDE(exchange-contract/methods)
 INCLUDE(methods.cmake)
 
@@ -24,14 +25,15 @@ SET(OPENSSL_WASM_INCLUDE_DIR ${OPENSSL_BUILD_DIR}/precompiled/include)
 SET(OPENSSL_WASM_LIB_DIR ${OPENSSL_BUILD_DIR}/precompiled/lib)
 SET(OPENSSL_WASM_CRYPTO_LIB ${OPENSSL_WASM_LIB_DIR}/libcrypto.a)
 SET(OPENSSL_WASM_SSL_LIB ${OPENSSL_WASM_LIB_DIR}/libssl.a)
+SET(OPENSSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/packages/openssl)
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${OPENSSL_WASM_CRYPTO_LIB} ${OPENSSL_WASM_SSL_LIB} ${OPENSSL_WASM_INCLUDE_DIR}
   BYPRODUCTS ${OPENSSL_BUILD_DIR}/${OPENSSL_VERSION}
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/openssl/build.sh
-  ARGS -o ${OPENSSL_BUILD_DIR}/precompiled -p ${CMAKE_CURRENT_SOURCE_DIR}/openssl/patches -v ${OPENSSL_VERSION}
+  COMMAND ${OPENSSL_SOURCE_DIR}/build.sh
+  ARGS -o ${OPENSSL_BUILD_DIR}/precompiled -p ${OPENSSL_SOURCE_DIR}/patches -v ${OPENSSL_VERSION}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/openssl/build.sh ${CMAKE_CURRENT_SOURCE_DIR}/openssl/patches/*.patch
+  DEPENDS ${OPENSSL_SOURCE_DIR}/build.sh ${OPENSSL_SOURCE_DIR}/patches/*.patch
   COMMENT "Building OpenSSL for WebAssembly"
 )
 
@@ -41,32 +43,33 @@ ADD_CUSTOM_TARGET(
 )
 
 # -----------------------------------------------------------------
-ADD_LIBRARY(${IDENTITY_LIB} STATIC ${IDENTITY_SOURCES})
-SET_PROPERTY(TARGET ${IDENTITY_LIB} APPEND_STRING PROPERTY COMPILE_OPTIONS "${WASM_BUILD_OPTIONS}" "-Wno-deprecated")
-SET_PROPERTY(TARGET ${IDENTITY_LIB} APPEND_STRING PROPERTY LINK_OPTIONS "${WASM_LINK_OPTIONS}")
-SET_TARGET_PROPERTIES(${IDENTITY_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ADD_LIBRARY(${${CF_HANDLE}_LIB} STATIC ${${CF_HANDLE}_SOURCES})
+SET_PROPERTY(TARGET ${${CF_HANDLE}_LIB} APPEND_STRING PROPERTY COMPILE_OPTIONS "${WASM_BUILD_OPTIONS}" "-Wno-deprecated")
+SET_PROPERTY(TARGET ${${CF_HANDLE}_LIB} APPEND_STRING PROPERTY LINK_OPTIONS "${WASM_LINK_OPTIONS}")
+SET_TARGET_PROPERTIES(${${CF_HANDLE}_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
 
-TARGET_INCLUDE_DIRECTORIES(${IDENTITY_LIB} PUBLIC ${IDENTITY_INCLUDES})
-TARGET_INCLUDE_DIRECTORIES(${IDENTITY_LIB} PUBLIC ${EXCHANGE_INCLUDES})
-TARGET_INCLUDE_DIRECTORIES(${IDENTITY_LIB} PUBLIC ${WASM_INCLUDES})
-TARGET_INCLUDE_DIRECTORIES(${IDENTITY_LIB} PUBLIC ${OPENSSL_WASM_INCLUDE_DIR})
+TARGET_INCLUDE_DIRECTORIES(${${CF_HANDLE}_LIB} PUBLIC ${${CF_HANDLE}_INCLUDES})
+TARGET_INCLUDE_DIRECTORIES(${${CF_HANDLE}_LIB} PUBLIC ${EXCHANGE_INCLUDES})
+TARGET_INCLUDE_DIRECTORIES(${${CF_HANDLE}_LIB} PUBLIC ${WASM_INCLUDES})
+TARGET_INCLUDE_DIRECTORIES(${${CF_HANDLE}_LIB} PUBLIC ${OPENSSL_WASM_INCLUDE_DIR})
 
-ADD_DEPENDENCIES(${IDENTITY_LIB} openssl_wasm)
+ADD_DEPENDENCIES(${${CF_HANDLE}_LIB} openssl_wasm)
 
 # -----------------------------------------------------------------
-BUILD_CONTRACT(signature_authority contracts/signature_authority.cpp
-  HEADERS ${EXCHANGE_INCLUDES} ${IDENTITY_INCLUDES}
-  LIBRARIES ${EXCHANGE_LIB} ${IDENTITY_LIB} ${OPENSSL_WASM_CRYPTO_LIB})
-
-BUILD_CONTRACT(identity contracts/identity.cpp
-  HEADERS ${EXCHANGE_INCLUDES} ${IDENTITY_INCLUDES}
-  LIBRARIES ${EXCHANGE_LIB} ${IDENTITY_LIB} ${OPENSSL_WASM_CRYPTO_LIB})
+FOREACH(contract ${CF_CONTRACTS})
+  MESSAGE(NOTICE "Building contract ${contract}")
+  BUILD_CONTRACT(${CF_NAME}_${contract} src/contracts/${contract}.cpp
+    HEADERS ${EXCHANGE_INCLUDES} ${${CF_HANDLE}_INCLUDES}
+    LIBRARIES ${EXCHANGE_LIB} ${${CF_HANDLE}_LIB} ${OPENSSL_WASM_CRYPTO_LIB}
+  )
+ENDFOREACH()
 
 # -----------------------------------------------------------------
 INCLUDE(Python)
-BUILD_WHEEL(identity)
+LIST(TRANSFORM CF_CONTRACTS PREPEND ${CF_NAME}_ OUTPUT_VARIABLE expanded_contracts)
+BUILD_WHEEL(${CF_NAME} ${expanded_contracts})
 
 # -----------------------------------------------------------------
 INCLUDE(Test)
 # ADD_SHELL_TEST(identity script SCRIPT test/script_test.sh)
-ADD_SHELL_TEST(identity functional SCRIPT test/run_tests.sh)
+ADD_SHELL_TEST(${CF_NAME} functional SCRIPT test/run_tests.sh)

identity-contract/family.cmake

@@ -0,0 +1,18 @@
+# Copyright 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SET(CF_NAME identity)
+SET(CF_CONTRACTS identity signature_authority)
+
+STRING(TOUPPER ${CF_NAME} CF_HANDLE)

identity-contract/methods.cmake

@@ -12,30 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+INCLUDE(family.cmake)
+
 IF(NOT DEFINED EXCHANGE_INCLUDES)
   MESSAGE(FATAL_ERROR "EXCHANGE_INCLUDES is not defined")
 ENDIF()
 
 # ---------------------------------------------
 # Set up the include list
 # ---------------------------------------------
-SET (IDENTITY_INCLUDES ${WASM_INCLUDES})
-LIST(APPEND IDENTITY_INCLUDES ${EXCHANGE_INCLUDES})
-LIST(APPEND IDENTITY_INCLUDES ${CMAKE_CURRENT_LIST_DIR})
+SET (${CF_HANDLE}_INCLUDES ${WASM_INCLUDES})
+LIST(APPEND ${CF_HANDLE}_INCLUDES ${EXCHANGE_INCLUDES})
+LIST(APPEND ${CF_HANDLE}_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/src)
 
 # ---------------------------------------------
 # Set up the default source list
 # ---------------------------------------------
-FILE(GLOB IDENTITY_COMMON_SOURCE ${CMAKE_CURRENT_LIST_DIR}/identity/common/[A-Za-z]*.cpp)
-FILE(GLOB IDENTITY_CRYPTO_SOURCE ${CMAKE_CURRENT_LIST_DIR}/identity/crypto/[A-Za-z]*.cpp)
-FILE(GLOB IDENTITY_CONTRACT_SOURCE ${CMAKE_CURRENT_LIST_DIR}/identity/contracts/[A-Za-z]*.cpp)
+FILE(GLOB ${CF_HANDLE}_COMMON_SOURCE ${CMAKE_CURRENT_LIST_DIR}/src/common/[A-Za-z]*.cpp)
+FILE(GLOB ${CF_HANDLE}_CRYPTO_SOURCE ${CMAKE_CURRENT_LIST_DIR}/src/crypto/[A-Za-z]*.cpp)
+FILE(GLOB ${CF_HANDLE}_CONTRACT_SOURCE ${CMAKE_CURRENT_LIST_DIR}/src/methods/[A-Za-z]*.cpp)
 
-SET (IDENTITY_SOURCES)
-LIST(APPEND IDENTITY_SOURCES ${IDENTITY_COMMON_SOURCE})
-LIST(APPEND IDENTITY_SOURCES ${IDENTITY_CRYPTO_SOURCE})
-LIST(APPEND IDENTITY_SOURCES ${IDENTITY_CONTRACT_SOURCE})
+SET (${CF_HANDLE}_SOURCES)
+LIST(APPEND ${CF_HANDLE}_SOURCES ${${CF_HANDLE}_COMMON_SOURCE})
+LIST(APPEND ${CF_HANDLE}_SOURCES ${${CF_HANDLE}_CRYPTO_SOURCE})
+LIST(APPEND ${CF_HANDLE}_SOURCES ${${CF_HANDLE}_CONTRACT_SOURCE})
 
 # ---------------------------------------------
 # Build the wawaka contract common library
 # ---------------------------------------------
-SET(IDENTITY_LIB ww_identity)
+SET(${CF_HANDLE}_LIB ww_${CF_NAME})