Skip to content

Commit 84c7d73

Browse files
ArtemkaaasArtemkaaas
committed
Updated xCode wrapper
Signed-off-by: artem.ivanov <[email protected]>
1 parent 71251ed commit 84c7d73

File tree

5 files changed

+74
-40
lines changed

5 files changed

+74
-40
lines changed

‎wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Payment/PaymentHighCases.mm‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ - (void)tearDown {
3434
NSString *paymentMethod = @"null";
3535
NSString *paymentAddress = @"pay:null:test";
3636
NSString *inputs = @"[\"pay:null:1\", \"pay:null:2\"]";
37-
NSString *outputs = @"[{\"recipient\": \"pay:null:1\", \"amount\":1, \"extra\":\"1\"}, {\"recipient\": \"pay:null:2\", \"amount\":2, \"extra\":\"2\"}]";
37+
NSString *outputs = @"[{\"recipient\": \"pay:null:1\", \"amount\":1}, {\"recipient\": \"pay:null:2\", \"amount\":2}]";
3838
NSString *fees = @"{\"txnType1\":1, \"txnType2\":2}";
3939
NSString *incompatibleInputs = @"[\"pay:PAYMENT_METHOD_1:1\", \"pay:PAYMENT_METHOD_2:1\"]";
4040

@@ -68,6 +68,19 @@ - (void)testAddRequestFeesWorks {
6868
submitterDid:[TestUtils trusteeDid]
6969
inputsJson:inputs
7070
outputsJson:outputs
71+
extra:nil
72+
requestWithFeesJson:nil
73+
paymentMethod:nil];
74+
XCTAssertEqual(ret.code, PaymentUnknownMethodError);
75+
}
76+
77+
- (void)testAddRequestFeesWorksForExtra {
78+
ret = [[PaymentUtils sharedInstance] addFeesToRequest:@"{}"
79+
walletHandle:walletHandle
80+
submitterDid:[TestUtils trusteeDid]
81+
inputsJson:inputs
82+
outputsJson:outputs
83+
extra:@"Extra data"
7184
requestWithFeesJson:nil
7285
paymentMethod:nil];
7386
XCTAssertEqual(ret.code, PaymentUnknownMethodError);
@@ -79,6 +92,7 @@ - (void)testAddRequestFeesWorksForSeveralMethods {
7992
submitterDid:[TestUtils trusteeDid]
8093
inputsJson:incompatibleInputs
8194
outputsJson:@"[]"
95+
extra:nil
8296
requestWithFeesJson:nil
8397
paymentMethod:nil];
8498
XCTAssertEqual(ret.code, PaymentIncompatibleMethodsError);
@@ -97,19 +111,19 @@ - (void)testParseResponseWithFeesWorks {
97111

98112
- (void)testBuildGetPaymentSourcesRequestWorks {
99113
ret = [[PaymentUtils sharedInstance] buildGetPaymentSourcesRequest:walletHandle
100-
submitterDid:[TestUtils trusteeDid]
101-
paymentAddress:paymentAddress
102-
getSourcesTxnJson:nil
103-
paymentMethod:nil];
114+
submitterDid:[TestUtils trusteeDid]
115+
paymentAddress:paymentAddress
116+
getSourcesTxnJson:nil
117+
paymentMethod:nil];
104118
XCTAssertEqual(ret.code, PaymentUnknownMethodError);
105119
}
106120

107121
// MARK: - Parse Get Sources Response
108122

109123
- (void)testParseGetPaymentSourcesResponseWorks {
110124
ret = [[PaymentUtils sharedInstance] parseGetPaymentSourcesResponse:@"{}"
111-
paymentMethod:paymentMethod
112-
sourcesJson:nil];
125+
paymentMethod:paymentMethod
126+
sourcesJson:nil];
113127
XCTAssertEqual(ret.code, PaymentUnknownMethodError);
114128
}
115129

@@ -120,6 +134,7 @@ - (void)testBuildPaymentRequestWorks {
120134
submitterDid:[TestUtils trusteeDid]
121135
inputsJson:inputs
122136
outputsJson:outputs
137+
extra:nil
123138
paymentReqJson:nil
124139
paymentMethod:nil];
125140
XCTAssertEqual(ret.code, PaymentUnknownMethodError);
@@ -140,6 +155,7 @@ - (void)testBuildMintRequestWorks {
140155
ret = [[PaymentUtils sharedInstance] buildMintRequest:walletHandle
141156
submitterDid:[TestUtils trusteeDid]
142157
outputsJson:outputs
158+
extra:nil
143159
mintReqJson:nil
144160
paymentMethod:nil];
145161
XCTAssertEqual(ret.code, PaymentUnknownMethodError);

‎wrappers/ios/libindy-pod/Indy-demoTests/Test Utils/PaymentUtils.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
submitterDid:(NSString *)submitterDid
2323
inputsJson:(NSString *)inputsJson
2424
outputsJson:(NSString *)outputsJson
25+
extra:(NSString *)extra
2526
requestWithFeesJson:(NSString **)requestWithFeesJson
2627
paymentMethod:(NSString **)paymentMethod;
2728

@@ -45,6 +46,7 @@
4546
submitterDid:(NSString *)submitterDid
4647
inputsJson:(NSString *)inputsJson
4748
outputsJson:(NSString *)outputsJson
49+
extra:(NSString *)extra
4850
paymentReqJson:(NSString **)paymentReqJson
4951
paymentMethod:(NSString **)paymentMethod;
5052

@@ -56,6 +58,7 @@
5658
- (NSError *)buildMintRequest:(IndyHandle)walletHandle
5759
submitterDid:(NSString *)submitterDid
5860
outputsJson:(NSString *)outputsJson
61+
extra:(NSString *)extra
5962
mintReqJson:(NSString **)mintReqJson
6063
paymentMethod:(NSString **)paymentMethod;
6164

‎wrappers/ios/libindy-pod/Indy-demoTests/Test Utils/PaymentUtils.m‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ - (NSError *)addFeesToRequest:(NSString *)requestJson
6666
submitterDid:(NSString *)submitterDid
6767
inputsJson:(NSString *)inputsJson
6868
outputsJson:(NSString *)outputsJson
69+
extra:(NSString *)extra
6970
requestWithFeesJson:(NSString **)requestWithFeesJson
7071
paymentMethod:(NSString **)paymentMethod {
7172
XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
@@ -78,6 +79,7 @@ - (NSError *)addFeesToRequest:(NSString *)requestJson
7879
submitterDid:submitterDid
7980
inputsJson:inputsJson
8081
outputsJson:outputsJson
82+
extra:extra
8183
completion:^(NSError *error, NSString *req, NSString *method) {
8284
err = error;
8385
outReq = req;
@@ -115,24 +117,24 @@ - (NSError *)parseResponseWithFees:(NSString *)responseJson
115117
}
116118

117119
- (NSError *)buildGetPaymentSourcesRequest:(IndyHandle)walletHandle
118-
submitterDid:(NSString *)submitterDid
119-
paymentAddress:(NSString *)paymentAddress
120-
getSourcesTxnJson:(NSString **)getSourcesTxnJson
121-
paymentMethod:(NSString **)paymentMethod {
120+
submitterDid:(NSString *)submitterDid
121+
paymentAddress:(NSString *)paymentAddress
122+
getSourcesTxnJson:(NSString **)getSourcesTxnJson
123+
paymentMethod:(NSString **)paymentMethod {
122124
XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
123125
__block NSError *err = nil;
124126
__block NSString *outReq = nil;
125127
__block NSString *outPayMethod = nil;
126128

127129
[IndyPayment buildGetPaymentSourcesRequest:walletHandle
128-
submitterDid:submitterDid
129-
paymentAddress:paymentAddress
130-
completion:^(NSError *error, NSString *req, NSString *method) {
131-
err = error;
132-
outReq = req;
133-
outPayMethod = method;
134-
[completionExpectation fulfill];
135-
}];
130+
submitterDid:submitterDid
131+
paymentAddress:paymentAddress
132+
completion:^(NSError *error, NSString *req, NSString *method) {
133+
err = error;
134+
outReq = req;
135+
outPayMethod = method;
136+
[completionExpectation fulfill];
137+
}];
136138

137139
[self waitForExpectations:@[completionExpectation] timeout:[TestUtils longTimeout]];
138140

@@ -142,19 +144,19 @@ - (NSError *)buildGetPaymentSourcesRequest:(IndyHandle)walletHandle
142144
}
143145

144146
- (NSError *)parseGetPaymentSourcesResponse:(NSString *)responseJson
145-
paymentMethod:(NSString *)paymentMethod
146-
sourcesJson:(NSString **)sourcesJson {
147+
paymentMethod:(NSString *)paymentMethod
148+
sourcesJson:(NSString **)sourcesJson {
147149
XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
148150
__block NSError *err = nil;
149151
__block NSString *outSources = nil;
150152

151153
[IndyPayment parseGetPaymentSourcesResponse:responseJson
152-
paymentMethod:paymentMethod
153-
completion:^(NSError *error, NSString *sources) {
154-
err = error;
155-
outSources = sources;
156-
[completionExpectation fulfill];
157-
}];
154+
paymentMethod:paymentMethod
155+
completion:^(NSError *error, NSString *sources) {
156+
err = error;
157+
outSources = sources;
158+
[completionExpectation fulfill];
159+
}];
158160

159161
[self waitForExpectations:@[completionExpectation] timeout:[TestUtils longTimeout]];
160162

@@ -167,6 +169,7 @@ - (NSError *)buildPaymentRequest:(IndyHandle)walletHandle
167169
submitterDid:(NSString *)submitterDid
168170
inputsJson:(NSString *)inputsJson
169171
outputsJson:(NSString *)outputsJson
172+
extra:(NSString *)extra
170173
paymentReqJson:(NSString **)paymentReqJson
171174
paymentMethod:(NSString **)paymentMethod {
172175
XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
@@ -178,6 +181,7 @@ - (NSError *)buildPaymentRequest:(IndyHandle)walletHandle
178181
submitterDid:submitterDid
179182
inputsJson:inputsJson
180183
outputsJson:outputsJson
184+
extra:extra
181185
completion:^(NSError *error, NSString *req, NSString *method) {
182186
err = error;
183187
outReq = req;
@@ -217,6 +221,7 @@ - (NSError *)parsePaymentResponse:(NSString *)responseJson
217221
- (NSError *)buildMintRequest:(IndyHandle)walletHandle
218222
submitterDid:(NSString *)submitterDid
219223
outputsJson:(NSString *)outputsJson
224+
extra:(NSString *)extra
220225
mintReqJson:(NSString **)mintReqJson
221226
paymentMethod:(NSString **)paymentMethod {
222227
XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
@@ -227,6 +232,7 @@ - (NSError *)buildMintRequest:(IndyHandle)walletHandle
227232
[IndyPayment buildMintRequest:walletHandle
228233
submitterDid:submitterDid
229234
outputsJson:outputsJson
235+
extra:extra
230236
completion:
231237
^(NSError *error, NSString *req, NSString *method) {
232238
err = error;

‎wrappers/ios/libindy-pod/Indy/Wrapper/IndyPayment.h‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@
6161
[{
6262
recipient: <str>, // payment address of recipient
6363
amount: <int>, // amount
64-
extra: <str>, // optional data
6564
}]
65+
@param extra Optional information for payment operation
6666
@param completion Callback that takes command result as parameter. Returns addRequestFeesRequest json.
6767
*/
6868
+ (void)addFeesToRequest:(NSString *)requestJson
6969
walletHandle:(IndyHandle)walletHandle
7070
submitterDid:(NSString *)submitterDid
7171
inputsJson:(NSString *)inputsJson
7272
outputsJson:(NSString *)outputsJson
73+
extra:(NSString *)extra
7374
completion:(void (^)(NSError *error, NSString *requestWithFeesJson, NSString *paymentMethod))completion;
7475

7576
/**
@@ -104,9 +105,9 @@
104105
paymentMethod - used payment method
105106
*/
106107
+ (void)buildGetPaymentSourcesRequest:(IndyHandle)walletHandle
107-
submitterDid:(NSString *)submitterDid
108-
paymentAddress:(NSString *)paymentAddress
109-
completion:(void (^)(NSError *error, NSString *getSourcesTxnJson, NSString *paymentMethod))completion;
108+
submitterDid:(NSString *)submitterDid
109+
paymentAddress:(NSString *)paymentAddress
110+
completion:(void (^)(NSError *error, NSString *getSourcesTxnJson, NSString *paymentMethod))completion;
110111

111112

112113
/**
@@ -124,8 +125,8 @@
124125
}]
125126
*/
126127
+ (void)parseGetPaymentSourcesResponse:(NSString *)responseJson
127-
paymentMethod:(NSString *)paymentMethod
128-
completion:(void (^)(NSError *error, NSString *sourcesJson))completion;
128+
paymentMethod:(NSString *)paymentMethod
129+
completion:(void (^)(NSError *error, NSString *sourcesJson))completion;
129130

130131

131132
/**
@@ -147,8 +148,8 @@
147148
[{
148149
recipient: <str>, // payment address of recipient
149150
amount: <int>, // amount
150-
extra: <str>, // optional data
151151
}]
152+
@param extra Optional information for payment operation
152153
@param completion Callback that takes command result as parameter.
153154
Returns
154155
paymentRequest - Indy request for doing payment.
@@ -158,6 +159,7 @@
158159
submitterDid:(NSString *)submitterDid
159160
inputsJson:(NSString *)inputsJson
160161
outputsJson:(NSString *)outputsJson
162+
extra:(NSString *)extra
161163
completion:(void (^)(NSError *error, NSString *paymentReqJson, NSString *paymentMethod))completion;
162164

163165
/**
@@ -188,8 +190,8 @@
188190
[{
189191
recipient: <str>, // payment address of recipient
190192
amount: <int>, // amount
191-
extra: <str>, // optional data
192193
}]
194+
@param extra Optional information for mint operation
193195
@param completion Callback that takes command result as parameter.
194196
Returns
195197
MintRequest - Indy request for doing minting
@@ -198,6 +200,7 @@
198200
+ (void)buildMintRequest:(IndyHandle)walletHandle
199201
submitterDid:(NSString *)submitterDid
200202
outputsJson:(NSString *)outputsJson
203+
extra:(NSString *)extra
201204
completion:(void (^)(NSError *error, NSString *mintReqJson, NSString *paymentMethod))completion;
202205

203206
/**

‎wrappers/ios/libindy-pod/Indy/Wrapper/IndyPayment.mm‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ + (void)addFeesToRequest:(NSString *)requestJson
5252
submitterDid:(NSString *)submitterDid
5353
inputsJson:(NSString *)inputsJson
5454
outputsJson:(NSString *)outputsJson
55+
extra:(NSString *)extra
5556
completion:(void (^)(NSError *error, NSString *requestWithFeesJson, NSString *paymentMethod))completion {
5657
indy_error_t ret;
5758

@@ -64,6 +65,7 @@ + (void)addFeesToRequest:(NSString *)requestJson
6465
[requestJson UTF8String],
6566
[inputsJson UTF8String],
6667
[outputsJson UTF8String],
68+
[extra UTF8String],
6769
IndyWrapperCommonStringStringCallback);
6870
if (ret != Success) {
6971
[[IndyCallbacks sharedInstance] deleteCommandHandleFor:handle];
@@ -96,9 +98,9 @@ + (void)parseResponseWithFees:(NSString *)responseJson
9698
}
9799

98100
+ (void)buildGetPaymentSourcesRequest:(IndyHandle)walletHandle
99-
submitterDid:(NSString *)submitterDid
100-
paymentAddress:(NSString *)paymentAddress
101-
completion:(void (^)(NSError *error, NSString *getSourcesTxnJson, NSString *paymentMethod))completion {
101+
submitterDid:(NSString *)submitterDid
102+
paymentAddress:(NSString *)paymentAddress
103+
completion:(void (^)(NSError *error, NSString *getSourcesTxnJson, NSString *paymentMethod))completion {
102104
indy_error_t ret;
103105

104106
indy_handle_t handle = [[IndyCallbacks sharedInstance] createCommandHandleFor:completion];
@@ -119,8 +121,8 @@ + (void)buildGetPaymentSourcesRequest:(IndyHandle)walletHandle
119121
}
120122

121123
+ (void)parseGetPaymentSourcesResponse:(NSString *)responseJson
122-
paymentMethod:(NSString *)paymentMethod
123-
completion:(void (^)(NSError *error, NSString *sourcesJson))completion {
124+
paymentMethod:(NSString *)paymentMethod
125+
completion:(void (^)(NSError *error, NSString *sourcesJson))completion {
124126
indy_error_t ret;
125127

126128
indy_handle_t handle = [[IndyCallbacks sharedInstance] createCommandHandleFor:completion];
@@ -144,6 +146,7 @@ + (void)buildPaymentRequest:(IndyHandle)walletHandle
144146
submitterDid:(NSString *)submitterDid
145147
inputsJson:(NSString *)inputsJson
146148
outputsJson:(NSString *)outputsJson
149+
extra:(NSString *)extra
147150
completion:(void (^)(NSError *error, NSString *paymentReqJson, NSString *paymentMethod))completion {
148151
indy_error_t ret;
149152

@@ -155,6 +158,7 @@ + (void)buildPaymentRequest:(IndyHandle)walletHandle
155158
[submitterDid UTF8String],
156159
[inputsJson UTF8String],
157160
[outputsJson UTF8String],
161+
[extra UTF8String],
158162
IndyWrapperCommonStringStringCallback);
159163
if (ret != Success) {
160164
[[IndyCallbacks sharedInstance] deleteCommandHandleFor:handle];
@@ -189,6 +193,7 @@ + (void)parsePaymentResponse:(NSString *)responseJson
189193
+ (void)buildMintRequest:(IndyHandle)walletHandle
190194
submitterDid:(NSString *)submitterDid
191195
outputsJson:(NSString *)outputsJson
196+
extra:(NSString *)extra
192197
completion:(void (^)(NSError *error, NSString *mintReqJson, NSString *paymentMethod))completion {
193198
indy_error_t ret;
194199

@@ -199,6 +204,7 @@ + (void)buildMintRequest:(IndyHandle)walletHandle
199204
walletHandle,
200205
[submitterDid UTF8String],
201206
[outputsJson UTF8String],
207+
[extra UTF8String],
202208
IndyWrapperCommonStringStringCallback);
203209
if (ret != Success) {
204210
[[IndyCallbacks sharedInstance] deleteCommandHandleFor:handle];

0 commit comments

Comments
 (0)