Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #11 from hyperledger/master
Browse files Browse the repository at this point in the history
Merging master from hyperledger
  • Loading branch information
anastasia-tarasova authored Jul 6, 2017
2 parents 1ee22d4 + 22e5f5d commit 4d969b6
Show file tree
Hide file tree
Showing 31 changed files with 1,167 additions and 213 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ cargo-registry
target
Cargo.lock
.idea
.DS_Store
Podfile.lock

2 changes: 1 addition & 1 deletion build-libsovrin-core-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export PKG_CONFIG_ALLOW_CROSS=1
export OPENSSL_DIR=/usr/local/Cellar/openssl/1.0.2k
export EVERNYM_REPO_KEY=~/Documents/EvernymRepo
export LIBSOVRIN_POD_VERSION=0.0.2
export LIBSOVRIN_POD_VERSION=0.0.3
export POD_FILE_NAME=libsovrin-core-ios.tar.gz

echo "\nBuild IOS POD started..."
Expand Down
1 change: 0 additions & 1 deletion include/sovrin_agent.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ extern sovrin_error_t sovrin_agent_add_identity(sovrin_handle_t command_handle,

extern sovrin_error_t sovrin_agent_remove_identity(sovrin_handle_t command_handle,
sovrin_handle_t listener_handle,
sovrin_handle_t pool_handle,
sovrin_handle_t wallet_handle,
const char * did,

Expand Down
2 changes: 1 addition & 1 deletion tests/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ mod high_cases {
fn sovrin_delete_pool_ledger_config_works_for_opened() {
TestUtils::cleanup_storage();

let pool_name = "sovrin_remove_pool_ledger_config_works";
let pool_name = "sovrin_remove_pool_ledger_config_works_for_opened";
PoolUtils::create_and_open_pool_ledger_config(pool_name).unwrap();

assert_eq!(PoolUtils::delete(pool_name).unwrap_err(), ErrorCode::CommonInvalidState);
Expand Down
8 changes: 4 additions & 4 deletions wrappers/ios/libsovrin-pod/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ workspace 'libsovrin.xcworkspace'
#use_frameworks!

def appPods
pod 'libsodium',"~> 1.0.12"
pod 'libzmq',"~> 4.2.3"
pod 'libsodium',"1.0.12"
pod 'libzmq-pw',"4.2.2"
pod 'OpenSSL'
pod 'milagro'
pod 'libsovrin-core'
pod 'milagro', "3.0.0"
pod 'libsovrin-core', "0.1.1"
end

target 'libsovrin-demo' do
Expand Down
37 changes: 0 additions & 37 deletions wrappers/ios/libsovrin-pod/Podfile.lock

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
3E2A7F931EC36186006194EC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E2A7F911EC36186006194EC /* Main.storyboard */; };
3E2A7F951EC36186006194EC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3E2A7F941EC36186006194EC /* Assets.xcassets */; };
3E2A7F981EC36187006194EC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E2A7F961EC36187006194EC /* LaunchScreen.storyboard */; };
5D6B306C1F0CDA0100B0C48D /* ClosureUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6B306B1F0CDA0100B0C48D /* ClosureUtils.m */; };
7C7243E8873EB75A41166DF8 /* libPods-libsovrin-demoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 531A898BBDFEC0A267CFA0E9 /* libPods-libsovrin-demoTests.a */; };
8404D1421EF7D0E900709F1B /* NSString+Validation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8404D1411EF7D0E900709F1B /* NSString+Validation.m */; };
84275F2E1EFA5B5C00352D72 /* AnoncredsMediumCasesDemos.m in Sources */ = {isa = PBXBuildFile; fileRef = 84275F2D1EFA5B5C00352D72 /* AnoncredsMediumCasesDemos.m */; };
Expand All @@ -25,7 +26,6 @@
848FF4121EFC0987009D2FC9 /* AgentMediumCases.m in Sources */ = {isa = PBXBuildFile; fileRef = 848FF4111EFC0987009D2FC9 /* AgentMediumCases.m */; };
848FF4141EFC0D66009D2FC9 /* AgentUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 848FF4131EFC0D66009D2FC9 /* AgentUtils.m */; };
848FF41A1EFD33B3009D2FC9 /* Base58Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 848FF4191EFD33B3009D2FC9 /* Base58Test.m */; };
848FF4211EFD46B3009D2FC9 /* NSString+Base58.mm in Sources */ = {isa = PBXBuildFile; fileRef = 848FF4201EFD46B3009D2FC9 /* NSString+Base58.mm */; };
84CFCAD71EF3F7C500F91426 /* LedgerAttribRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84CFCACA1EF3F7C500F91426 /* LedgerAttribRequest.mm */; };
84CFCAD81EF3F7C500F91426 /* LedgerNodeRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84CFCACB1EF3F7C500F91426 /* LedgerNodeRequest.mm */; };
84CFCAD91EF3F7C500F91426 /* LedgerNymRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84CFCACC1EF3F7C500F91426 /* LedgerNymRequest.mm */; };
Expand Down Expand Up @@ -102,6 +102,8 @@
3E2A7FA41EC36187006194EC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4321F9BC0EC374D87F80862C /* Pods-libsovrin-demoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-libsovrin-demoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-libsovrin-demoTests/Pods-libsovrin-demoTests.release.xcconfig"; sourceTree = "<group>"; };
531A898BBDFEC0A267CFA0E9 /* libPods-libsovrin-demoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-libsovrin-demoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5D6B306A1F0CDA0100B0C48D /* ClosureUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClosureUtils.h; sourceTree = "<group>"; };
5D6B306B1F0CDA0100B0C48D /* ClosureUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClosureUtils.m; sourceTree = "<group>"; };
8404D1411EF7D0E900709F1B /* NSString+Validation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Validation.m"; sourceTree = "<group>"; };
8404D1431EF7D0F900709F1B /* NSString+Validation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Validation.h"; sourceTree = "<group>"; };
84275F2D1EFA5B5C00352D72 /* AnoncredsMediumCasesDemos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnoncredsMediumCasesDemos.m; sourceTree = "<group>"; };
Expand All @@ -114,8 +116,6 @@
848FF4131EFC0D66009D2FC9 /* AgentUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AgentUtils.m; sourceTree = "<group>"; };
848FF4151EFC0D72009D2FC9 /* AgentUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AgentUtils.h; sourceTree = "<group>"; };
848FF4191EFD33B3009D2FC9 /* Base58Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base58Test.m; sourceTree = "<group>"; };
848FF41F1EFD46AB009D2FC9 /* NSString+Base58.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSString+Base58.h"; path = "../../../../../../../../../.Trash/NSString+Base58.h"; sourceTree = "<group>"; };
848FF4201EFD46B3009D2FC9 /* NSString+Base58.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSString+Base58.mm"; path = "../../../../../../../../../.Trash/NSString+Base58.mm"; sourceTree = "<group>"; };
84CFCACA1EF3F7C500F91426 /* LedgerAttribRequest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LedgerAttribRequest.mm; sourceTree = "<group>"; };
84CFCACB1EF3F7C500F91426 /* LedgerNodeRequest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LedgerNodeRequest.mm; sourceTree = "<group>"; };
84CFCACC1EF3F7C500F91426 /* LedgerNymRequest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LedgerNymRequest.mm; sourceTree = "<group>"; };
Expand Down Expand Up @@ -305,6 +305,8 @@
84CFCAF41EF3F7D300F91426 /* WalletUtils.m */,
848FF4151EFC0D72009D2FC9 /* AgentUtils.h */,
848FF4131EFC0D66009D2FC9 /* AgentUtils.m */,
5D6B306A1F0CDA0100B0C48D /* ClosureUtils.h */,
5D6B306B1F0CDA0100B0C48D /* ClosureUtils.m */,
);
path = "Test Utils";
sourceTree = "<group>";
Expand All @@ -318,8 +320,6 @@
8404D1411EF7D0E900709F1B /* NSString+Validation.m */,
84F0FD3F1EF7F0E40022A01D /* NSArray+JSON.h */,
84F0FD3D1EF7F0D80022A01D /* NSArray+JSON.m */,
848FF41F1EFD46AB009D2FC9 /* NSString+Base58.h */,
848FF4201EFD46B3009D2FC9 /* NSString+Base58.mm */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -604,7 +604,6 @@
84CFCAE01EF3F7C500F91426 /* WalletMediumCases.m in Sources */,
84275F2E1EFA5B5C00352D72 /* AnoncredsMediumCasesDemos.m in Sources */,
84CFCAE41EF3F7CC00F91426 /* AnoncredsDemo.mm in Sources */,
848FF4211EFD46B3009D2FC9 /* NSString+Base58.mm in Sources */,
848FF4141EFC0D66009D2FC9 /* AgentUtils.m in Sources */,
84CFCAF81EF3F7D300F91426 /* PoolUtils.m in Sources */,
8404D1421EF7D0E900709F1B /* NSString+Validation.m in Sources */,
Expand All @@ -623,6 +622,7 @@
848FF4071EFBBC04009D2FC9 /* PoolMediumCases.m in Sources */,
84CFCAF61EF3F7D300F91426 /* Environment.m in Sources */,
84CFCAD81EF3F7C500F91426 /* LedgerNodeRequest.mm in Sources */,
5D6B306C1F0CDA0100B0C48D /* ClosureUtils.m in Sources */,
84275F301EFA84C700352D72 /* LedgerHignCases.mm in Sources */,
84CFCAF91EF3F7D300F91426 /* SignusUtils.mm in Sources */,
848FF4051EFBBBE3009D2FC9 /* PoolHighCases.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3E2A7F841EC36186006194EC"
BuildableName = "libsovrin-demo.app"
BlueprintName = "libsovrin-demo"
ReferencedContainer = "container:libsovrin-demo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3E2A7F9D1EC36187006194EC"
BuildableName = "libsovrin-demoTests.xctest"
BlueprintName = "libsovrin-demoTests"
ReferencedContainer = "container:libsovrin-demo.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3E2A7F841EC36186006194EC"
BuildableName = "libsovrin-demo.app"
BlueprintName = "libsovrin-demo"
ReferencedContainer = "container:libsovrin-demo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3E2A7F841EC36186006194EC"
BuildableName = "libsovrin-demo.app"
BlueprintName = "libsovrin-demo"
ReferencedContainer = "container:libsovrin-demo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "RUST_LOG"
value = "trace"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
<AdditionalOption
key = "DYLD_INSERT_LIBRARIES"
value = "/usr/lib/libgmalloc.dylib"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocGuardEdges"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3E2A7F841EC36186006194EC"
BuildableName = "libsovrin-demo.app"
BlueprintName = "libsovrin-demo"
ReferencedContainer = "container:libsovrin-demo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit 4d969b6

Please sign in to comment.