Monnethic/java-api
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

develop test

Browse source
This commit is contained in:
GME 2019-03-26 21:07:52 +01:00
parent 2fbfb9e218
commit a2fc218e1d
9 changed files with 492 additions and 395 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

687
.idea/workspace.xml
View file

@ -2,13 +2,19 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment=""> <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/User/ReadUserTest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTrTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/msp/org1/admin.context" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/User/RegisterUserTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -18,102 +24,128 @@
<session id="-1607393105"> <session id="-1607393105">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="16" /> <entry key="project.closed" value="17" />
<entry key="project.open.time.5" value="3" /> <entry key="project.open.time.5" value="4" />
<entry key="project.open.time.6" value="11" /> <entry key="project.open.time.6" value="11" />
<entry key="project.open.time.7" value="1" />
<entry key="project.open.time.8" value="2" /> <entry key="project.open.time.8" value="2" />
<entry key="project.opened" value="16" /> <entry key="project.opened" value="18" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="class" value="3" /> <entry key="class" value="3" />
<entry key="java" value="29" /> <entry key="java" value="36" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="CLASS" value="3" /> <entry key="CLASS" value="3" />
<entry key="JAVA" value="29" /> <entry key="JAVA" value="36" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="java" value="277" /> <entry key="dummy" value="12" />
<entry key="java" value="458" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JAVA" value="277" /> <entry key="JAVA" value="458" />
<entry key="PLAIN_TEXT" value="12" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="QueryTest.java" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="289">
<caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" /> <caret line="27" column="8" selection-start-line="27" selection-start-column="8" selection-end-line="50" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QueryRegisterTest.java" pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/User/RegisterUserTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="446">
<caret line="37" column="118" selection-start-line="37" selection-start-column="118" selection-end-line="37" selection-end-column="118" /> <caret line="47" column="47" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="FabricClientWrapper.java" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119"> <state relative-caret-position="346">
<caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" /> <caret line="34" column="12" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="12" />
<folding> <folding>
<element signature="e#629#630#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#658#659#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/User/ReadUserTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="97"> <state relative-caret-position="377">
<caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" /> <caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Config.java" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTrTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731"> <state relative-caret-position="649">
<caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="69" /> <caret line="59" column="99" lean-forward="true" selection-start-line="59" selection-start-column="99" selection-end-line="59" selection-end-column="99" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ChaincodeTransactionTest.java" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="782"> <state relative-caret-position="629">
<caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="71" selection-end-column="99" /> <caret line="59" column="12" selection-start-line="59" selection-start-column="12" selection-end-line="71" selection-end-column="99" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ChannelClientWrapper.java" pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="488">
<caret line="45" column="57" selection-start-line="45" selection-start-column="57" selection-end-line="45" selection-end-column="69" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java"> <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629"> <state relative-caret-position="434">
<caret line="52" column="39" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" /> <caret line="59" column="111" selection-start-line="59" selection-start-column="111" selection-end-line="59" selection-end-column="111" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -166,13 +198,18 @@
<option value="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" /> <option value="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" />
<option value="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" /> <option value="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" /> <option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" /> <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" /> <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" /> <option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" /> <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
<option value="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTrTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/User/QueryRegisterTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/User/RegisterUserTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/User/ReadUserTest.java" />
<option value="$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java" />
</list> </list>
</option> </option>
</component> </component>
@ -182,9 +219,6 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="676" /> <option name="x" value="676" />
<option name="y" value="-9" /> <option name="y" value="-9" />
@ -196,7 +230,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="AndroidView" /> <pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -209,12 +243,6 @@
<item name="java-api" type="462c0819:PsiDirectoryNode" /> <item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="msp" type="462c0819:PsiDirectoryNode" /> <item name="msp" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="msp" type="462c0819:PsiDirectoryNode" />
<item name="org1" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" /> <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" /> <item name="java-api" type="462c0819:PsiDirectoryNode" />
@ -358,6 +386,26 @@
<item name="blockchain" type="462c0819:PsiDirectoryNode" /> <item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="query" type="462c0819:PsiDirectoryNode" /> <item name="query" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="query" type="462c0819:PsiDirectoryNode" />
<item name="User" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="blockchain" type="462c0819:PsiDirectoryNode" />
<item name="query" type="462c0819:PsiDirectoryNode" />
<item name="Wallet" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="java-api" type="b2602c69:ProjectViewProjectNode" /> <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
<item name="java-api" type="462c0819:PsiDirectoryNode" /> <item name="java-api" type="462c0819:PsiDirectoryNode" />
@ -389,14 +437,13 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552598554961" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553630630055" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@ -425,180 +472,125 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.QueryTest"> <component name="RunManager" selected="JUnit.ReadUserTest">
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration> <method v="2">
<configuration name="ChaincodeTransactionTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <option name="Make" enabled="true" />
<module name="java-api" /> </method>
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.query.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.ChaincodeTransactionTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
</configuration>
<configuration name="QueryRegisterTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.query.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.QueryRegisterTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
</configuration> </configuration>
<configuration name="QueryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="QueryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" /> <module name="java-api" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="blockchain.query.*" /> <option name="PATTERN" value="blockchain.query.User.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="blockchain.query" /> <option name="PACKAGE_NAME" value="blockchain.query" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.QueryTest" /> <option name="MAIN_CLASS_NAME" value="blockchain.query.QueryTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" /> <option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" /> <method v="2">
<option name="TEST_SEARCH_SCOPE"> <option name="Make" enabled="true" />
<value defaultName="singleModule" /> </method>
</option>
<patterns />
</configuration> </configuration>
<configuration name="QueryWrapperTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="QueryWalletByOwnerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" /> <module name="java-api" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="blockchain.queryWrapper.*" /> <option name="PATTERN" value="blockchain.query.Wallet.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="PACKAGE_NAME" value="blockchain.query.Wallet" />
<option name="ALTERNATIVE_JRE_PATH" /> <option name="MAIN_CLASS_NAME" value="blockchain.query.Wallet.QueryWalletByOwnerTest" />
<option name="PACKAGE_NAME" value="blockchain.queryWrapper" />
<option name="MAIN_CLASS_NAME" value="blockchain.queryWrapper.QueryWrapperTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" /> <method v="2">
<option name="TEST_SEARCH_SCOPE"> <option name="Make" enabled="true" />
<value defaultName="singleModule" /> </method>
</option>
<patterns />
</configuration> </configuration>
<configuration name="TestEnrollAdmin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="QueryWalletByOwnerTrTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" /> <module name="java-api" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="blockchain.client.*" /> <option name="PATTERN" value="blockchain.query.Wallet.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="PACKAGE_NAME" value="blockchain.query.Wallet" />
<option name="ALTERNATIVE_JRE_PATH" /> <option name="MAIN_CLASS_NAME" value="blockchain.query.Wallet.QueryWalletByOwnerTrTest" />
<option name="PACKAGE_NAME" value="blockchain.client" />
<option name="MAIN_CLASS_NAME" value="blockchain.client.TestEnrollAdmin" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" /> <method v="2">
<option name="TEST_SEARCH_SCOPE"> <option name="Make" enabled="true" />
<value defaultName="singleModule" /> </method>
</option> </configuration>
<patterns /> <configuration name="ReadUserTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.query.User.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="blockchain.query.User" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.User.ReadUserTest" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="RegisterUserTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="java-api" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="blockchain.query.User.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="blockchain.query.User" />
<option name="MAIN_CLASS_NAME" value="blockchain.query.User.RegisterUserTest" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration> </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" /> <method v="2">
<option name="TEST_SEARCH_SCOPE"> <option name="Make" enabled="true" />
<value defaultName="singleModule" /> </method>
</option>
<patterns />
</configuration> </configuration>
<configuration name="App" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration name="App" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="java-api" /> <module name="java-api" />
<option name="SPRING_BOOT_MAIN_CLASS" value="application.App" /> <option name="SPRING_BOOT_MAIN_CLASS" value="application.App" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration> </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG"> <configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties /> <properties />
<listeners /> <listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration> </configuration>
<list> <list>
<item itemvalue="Spring Boot.App" /> <item itemvalue="Spring Boot.App" />
<item itemvalue="JUnit.QueryWrapperTest" />
<item itemvalue="JUnit.QueryTest" /> <item itemvalue="JUnit.QueryTest" />
<item itemvalue="JUnit.TestEnrollAdmin" /> <item itemvalue="JUnit.QueryWalletByOwnerTest" />
<item itemvalue="JUnit.ChaincodeTransactionTest" /> <item itemvalue="JUnit.QueryWalletByOwnerTrTest" />
<item itemvalue="JUnit.QueryRegisterTest" /> <item itemvalue="JUnit.ReadUserTest" />
<item itemvalue="JUnit.RegisterUserTest" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.ReadUserTest" />
<item itemvalue="JUnit.RegisterUserTest" />
<item itemvalue="JUnit.QueryWalletByOwnerTest" />
<item itemvalue="JUnit.QueryWalletByOwnerTrTest" />
<item itemvalue="JUnit.QueryTest" /> <item itemvalue="JUnit.QueryTest" />
<item itemvalue="JUnit.QueryRegisterTest" />
<item itemvalue="JUnit.TestEnrollAdmin" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -644,80 +636,82 @@
<workItem from="1552597573100" duration="981000" /> <workItem from="1552597573100" duration="981000" />
<workItem from="1552636396590" duration="1630000" /> <workItem from="1552636396590" duration="1630000" />
<workItem from="1552644219305" duration="1516000" /> <workItem from="1552644219305" duration="1516000" />
<workItem from="1553621954447" duration="5077000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="QueryChannelTest - 2019.02.27 at 20h 28m 38s.xml"> <history-entry file="QueryTest - 2019.03.26 at 20h 39m 55s.xml">
<configuration name="QueryChannelTest" configurationId="JUnit" />
</history-entry>
<history-entry file="QueryTest - 2019.02.27 at 20h 28m 57s.xml">
<configuration name="QueryTest" configurationId="JUnit" /> <configuration name="QueryTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestEnrollAdmin - 2019.03.14 at 20h 40m 04s.xml"> <history-entry file="QueryTest - 2019.03.26 at 20h 40m 26s.xml">
<configuration name="TestEnrollAdmin" configurationId="JUnit" />
</history-entry>
<history-entry file="QueryTest - 2019.03.14 at 20h 40m 44s.xml">
<configuration name="QueryTest" configurationId="JUnit" /> <configuration name="QueryTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryTest - 2019.03.14 at 20h 41m 41s.xml"> <history-entry file="QueryTest - 2019.03.26 at 20h 40m 45s.xml">
<configuration name="QueryTest" configurationId="JUnit" /> <configuration name="QueryTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryRegisterTest - 2019.03.14 at 22h 11m 03s.xml"> <history-entry file="QueryWalletByOwnerTest - 2019.03.26 at 20h 44m 27s.xml">
<configuration name="QueryRegisterTest" configurationId="JUnit" /> <configuration name="QueryWalletByOwnerTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryTest - 2019.03.14 at 22h 11m 39s.xml"> <history-entry file="QueryWalletByOwnerTrTest - 2019.03.26 at 20h 52m 41s.xml">
<configuration name="QueryTest" configurationId="JUnit" /> <configuration name="QueryWalletByOwnerTrTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryRegisterTest - 2019.03.14 at 22h 12m 09s.xml"> <history-entry file="QueryWalletByOwnerTest - 2019.03.26 at 20h 52m 54s.xml">
<configuration name="QueryRegisterTest" configurationId="JUnit" /> <configuration name="QueryWalletByOwnerTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryRegisterTest - 2019.03.15 at 09h 05m 13s.xml"> <history-entry file="ReadUserTest - 2019.03.26 at 20h 54m 43s.xml">
<configuration name="QueryRegisterTest" configurationId="JUnit" /> <configuration name="ReadUserTest" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="QueryTest - 2019.03.15 at 09h 05m 31s.xml"> <history-entry file="RegisterUserTest - 2019.03.26 at 20h 57m 47s.xml">
<configuration name="QueryTest" configurationId="JUnit" /> <configuration name="RegisterUserTest" configurationId="JUnit" />
</history-entry>
<history-entry file="ReadUserTest - 2019.03.26 at 20h 58m 21s.xml">
<configuration name="ReadUserTest" configurationId="JUnit" />
</history-entry>
<history-entry file="ReadUserTest - 2019.03.26 at 21h 01m 36s.xml">
<configuration name="ReadUserTest" configurationId="JUnit" />
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47600000" /> <option name="totallyTimeSpent" value="52677000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" order="3" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19674087" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16145833" side_tool="true" visible="true" weight="0.2858661" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info id="Capture Tool" order="8" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Database" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
<window_info id="UI Designer" order="4" /> <window_info id="UI Designer" order="4" />
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" />
<window_info anchor="bottom" id="Java Enterprise" order="13" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.8385417" weight="0.2858661" />
<window_info anchor="bottom" id="Spring" order="12" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1953125" />
<window_info anchor="right" id="Bean Validation" order="3" />
<window_info id="Web" order="7" side_tool="true" />
<window_info id="Learn" order="6" />
<window_info anchor="right" id="Theme Preview" order="7" />
<window_info id="Favorites" order="5" side_tool="true" /> <window_info id="Favorites" order="5" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info id="Learn" order="6" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Messages" order="8" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.8374404" visible="true" weight="0.40093604" />
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Messages" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16255961" side_tool="true" visible="true" weight="0.40093604" />
<window_info anchor="bottom" id="Spring" order="12" />
<window_info anchor="bottom" id="Java Enterprise" order="13" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="right" id="Database" order="5" />
<window_info anchor="right" id="Maven Projects" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Bean Validation" order="8" />
<window_info anchor="right" id="Theme Preview" order="9" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -726,61 +720,7 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java</url>
<line>41</line>
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="39" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="50" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="45" selection-start-line="6" selection-start-column="45" selection-end-line="6" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="10" lean-forward="true" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/java-api.iml" /> <entry file="file://$PROJECT_DIR$/java-api.iml" />
<entry file="file://$PROJECT_DIR$/.idea/misc.xml"> <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
@ -805,13 +745,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/utility/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/user/UserContext.java"> <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/user/UserContext.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="408">
@ -855,13 +788,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
@ -869,27 +795,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/queryWrapper/QueryWrapperTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="31" column="21" lean-forward="true" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java"> <entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1377"> <state relative-caret-position="1377">
@ -946,20 +851,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="57" column="93" selection-start-line="57" selection-start-column="93" selection-end-line="57" selection-end-column="93" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="85">
@ -981,13 +872,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748"> <state relative-caret-position="748">
@ -1002,52 +886,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="30" selection-start-line="30" selection-end-line="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731">
<caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="52" column="39" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="782">
<caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="71" selection-end-column="99" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
<folding>
<element signature="e#629#630#0" expanded="true" />
<element signature="e#658#659#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="97"> <state relative-caret-position="97">
@ -1055,10 +893,93 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java"> <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="357">
<caret line="37" column="118" selection-start-line="37" selection-start-column="118" selection-end-line="37" selection-end-column="118" /> <caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
<folding>
<element signature="e#629#630#0" expanded="true" />
<element signature="e#658#659#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="25" column="68" lean-forward="true" selection-start-line="25" selection-start-column="68" selection-end-line="25" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="59" column="111" selection-start-line="59" selection-start-column="111" selection-end-line="59" selection-end-column="111" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="27" column="8" selection-start-line="27" selection-start-column="8" selection-end-line="50" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="59" column="12" selection-start-line="59" selection-start-column="12" selection-end-line="71" selection-end-column="99" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTrTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="649">
<caret line="59" column="99" lean-forward="true" selection-start-line="59" selection-start-column="99" selection-end-line="59" selection-end-column="99" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="488">
<caret line="45" column="57" selection-start-line="45" selection-start-column="57" selection-end-line="45" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/User/RegisterUserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="446">
<caret line="47" column="47" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/User/ReadUserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="377">
<caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="34" column="12" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="12" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

BIN
msp/org1/admin.context
View file

Binary file not shown.

3
src/main/java/blockchain/client/ChannelClientWrapper.java
View file

@ -57,7 +57,8 @@ public class ChannelClientWrapper {
channel = channelClientWrapper.getChannel(); channel = channelClientWrapper.getChannel();
Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
//EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053"); //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:7053"); EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:7051");
//EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps592802.ovh.net:7053");
Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL); Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
channel.addPeer(peer); channel.addPeer(peer);
channel.addEventHub(eventHub); channel.addEventHub(eventHub);

8
src/main/java/blockchain/configuration/Config.java
View file

@ -23,10 +23,12 @@ public class Config {
//CA //CA
//public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054"; //public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";
public static final String CA_ORG1_URL = "http://93.30.148.59:7054"; public static final String CA_ORG1_URL = "http://93.30.148.59:7054";
//public static final String CA_ORG1_URL = "http://vps592802.ovh.net:7054";
//ORDERER //ORDERER
//public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050"; //public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050";
public static final String ORDERER_URL = "grpc://93.30.148.59:7050"; public static final String ORDERER_URL = "grpc://93.30.148.59:7050";
//public static final String ORDERER_URL = "grpc://vps592802.ovh.net:7050";
public static final String ORDERER_NAME = "orderer.example.com"; public static final String ORDERER_NAME = "orderer.example.com";
@ -34,8 +36,8 @@ public class Config {
public static final String CHANNEL_NAME = "mychannel"; public static final String CHANNEL_NAME = "mychannel";
//public static final String CHAINCODE_NAME = "mycc"; //public static final String CHAINCODE_NAME = "mycc";
//public static final String CHAINCODE_NAME = "monnethic"; public static final String CHAINCODE_NAME = "monnethic";
public static final String CHAINCODE_NAME = "monnethic-dev-4"; //public static final String CHAINCODE_NAME = "monnethic-dev-4";
//PEER 0 //PEER 0
public static final String ORG1_PEER_0 = "peer0.org1.example.com"; public static final String ORG1_PEER_0 = "peer0.org1.example.com";
@ -43,6 +45,8 @@ public class Config {
//public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051"; //public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051";
public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:7051"; public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:7051";
//public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:8051"; //public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:8051";
//ublic static final String ORG1_PEER_0_URL = "grpc://vps592802.ovh.net:7051";
//PEER 1 //PEER 1
public static final String ORG_PEER = "peer1.org1.example.com"; public static final String ORG_PEER = "peer1.org1.example.com";

6
src/test/java/blockchain/query/QueryTest.java
View file

@ -19,7 +19,7 @@ public class QueryTest {
private static Logger logger = Logger.getLogger(QueryTest.class); private static Logger logger = Logger.getLogger(QueryTest.class);
@Test @Test
public void TestAQueryChannels() { public void TestAQuery() {
BasicConfigurator.configure(); BasicConfigurator.configure();
//UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN); //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
@ -32,9 +32,9 @@ public class QueryTest {
ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper); ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
//String[] args1 = {"a"}; //String[] args1 = {"a"};
//String[] args1 = {"chef"}; String[] args1 = {"chef"};
//String[] args1 = {"bitman"}; //String[] args1 = {"bitman"};
String[] args1 = {"user_test"}; //String[] args1 = {"user_test"};
Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"query",args1); Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"query",args1);
for(ProposalResponse pres : responseQuery){ for(ProposalResponse pres : responseQuery){

53
src/test/java/blockchain/query/User/ReadUserTest.java Normal file
View file

@ -0,0 +1,53 @@
package blockchain.query.User;
import blockchain.client.ChannelClientWrapper;
import blockchain.client.FabricClientWrapper;
import blockchain.configuration.Config;
import blockchain.query.QueryTest;
import blockchain.user.UserContext;
import blockchain.utility.Util;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;
import org.hyperledger.fabric.sdk.ChaincodeResponse;
import org.hyperledger.fabric.sdk.ProposalResponse;
import org.junit.Ignore;
import org.junit.Test;
import java.util.Collection;
@Ignore
public class ReadUserTest {
private static Logger logger = Logger.getLogger(QueryTest.class);
@Test
public void TestQueryReadUser() {
BasicConfigurator.configure();
UserContext user = Util.readUserContext(Config.ORG1,"admin");
try{
String chaincode = Config.CHAINCODE_NAME;
FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
//String[] args1 = {"chef"};
String[] args1 = {"user_test"};
Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"readUser",args1);
logger.info("RESPONSE : "+responseQuery);
logger.info("RESPONSE : "+responseQuery.size());
for(ProposalResponse pres : responseQuery){
ChaincodeResponse.Status status = pres.getStatus();
if(status.getStatus()!=200){
throw new Exception(pres.getMessage());
}
String stringResponse = new String(pres.getChaincodeActionResponsePayload());
logger.info("RESPONSE : "+stringResponse);
}
}catch (Exception e){
e.printStackTrace();
}
}
}

11
src/test/java/blockchain/query/QueryRegisterTest.java → src/test/java/blockchain/query/User/RegisterUserTest.java
View file

@ -1,4 +1,4 @@
package blockchain.query; package blockchain.query.User;
import blockchain.client.ChannelClientWrapper; import blockchain.client.ChannelClientWrapper;
import blockchain.client.FabricClientWrapper; import blockchain.client.FabricClientWrapper;
@ -18,15 +18,14 @@ import java.util.stream.Collectors;
//Test to get balance of a User //Test to get balance of a User
@Ignore @Ignore
public class QueryRegisterTest { public class RegisterUserTest {
private static Logger logger = Logger.getLogger(QueryRegisterTest.class); private static Logger logger = Logger.getLogger(RegisterUserTest.class);
@Test @Test
public void TestAQueryChannels() { public void TestARegisterUser() {
BasicConfigurator.configure(); BasicConfigurator.configure();
UserContext user = Util.readUserContext(Config.ORG1,"admin"); UserContext user = Util.readUserContext(Config.ORG1,"admin");
//TODO BASE ON ChaincodeTransactionTest
try{ try{
String chaincode = Config.CHAINCODE_NAME; String chaincode = Config.CHAINCODE_NAME;
@ -35,7 +34,7 @@ public class QueryRegisterTest {
Channel channel = channelClientWrapper.getChannel(); Channel channel = channelClientWrapper.getChannel();
Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:8053"); EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:7051");
Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL); Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
channel.addPeer(peer); channel.addPeer(peer);
channel.addEventHub(eventHub); channel.addEventHub(eventHub);

50
src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java Normal file
View file

@ -0,0 +1,50 @@
package blockchain.query.Wallet;
import blockchain.client.ChannelClientWrapper;
import blockchain.client.FabricClientWrapper;
import blockchain.configuration.Config;
import blockchain.query.QueryTest;
import blockchain.user.UserContext;
import blockchain.utility.Util;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;
import org.hyperledger.fabric.sdk.ChaincodeResponse;
import org.hyperledger.fabric.sdk.ProposalResponse;
import org.junit.Ignore;
import org.junit.Test;
import java.util.Collection;
@Ignore
public class QueryWalletByOwnerTest {
private static Logger logger = Logger.getLogger(QueryTest.class);
@Test
public void TestQueryWallet() {
BasicConfigurator.configure();
UserContext user = Util.readUserContext(Config.ORG1,"admin");
try{
String chaincode = Config.CHAINCODE_NAME;
FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
String[] args1 = {"chef"};
Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"queryWalletsByOwner",args1);
for(ProposalResponse pres : responseQuery){
ChaincodeResponse.Status status = pres.getStatus();
if(status.getStatus()!=200){
throw new Exception(pres.getMessage());
}
String stringResponse = new String(pres.getChaincodeActionResponsePayload());
logger.info("RESPONSE : "+stringResponse);
}
}catch (Exception e){
e.printStackTrace();
}
}
}

69
src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTrTest.java Normal file
View file

@ -0,0 +1,69 @@
package blockchain.query.Wallet;
import blockchain.client.ChannelClientWrapper;
import blockchain.client.FabricClientWrapper;
import blockchain.configuration.Config;
import blockchain.query.QueryTest;
import blockchain.user.UserContext;
import blockchain.utility.Util;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;
import org.hyperledger.fabric.sdk.*;
import org.junit.Ignore;
import org.junit.Test;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@Ignore
public class QueryWalletByOwnerTrTest {
private static Logger logger = Logger.getLogger(QueryTest.class);
@Test
public void TestQueryWallet() {
BasicConfigurator.configure();
UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
try{
String chaincode = Config.CHAINCODE_NAME;
FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME);
Channel channel = channelClientWrapper.getChannel();
Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:87051");
Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
channel.addPeer(peer);
channel.addEventHub(eventHub);
channel.addOrderer(orderer);
channel.initialize();
TransactionProposalRequest tpr = fabricClientWrapper.getClient().newTransactionProposalRequest();
ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build();
tpr.setChaincodeID(cid);
tpr.setFcn("queryWalletsByOwner");
tpr.setArgs(new String[]{"chef"});
Collection<ProposalResponse> responses = channel.sendTransactionProposal(tpr);
List<ProposalResponse> invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList());
if (!invalid.isEmpty()) {
invalid.forEach(response -> {
logger.error(response.getMessage());
});
}
logger.info("SEND TRANSACTION");
BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get();
logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id
}catch (Exception e){
e.printStackTrace();
}
}
}