Skip to content

Commit 995dfb2

Browse files
samuelvenzisamuelvenzi
authored
Merge pull request #50 from hyperledger-labs/develop
Include last transaction ID as asset metadata
2 parents f6e887b + c2e4e8a commit 995dfb2

File tree

6 files changed

+18
-0
lines changed

6 files changed

+18
-0
lines changed

‎assets/asset.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ func (a *Asset) injectMetadata(stub *sw.StubWrapper) errors.ICCError {
9393
}
9494
(*a)["@lastUpdated"] = lastUpdated.AsTime().Format(time.RFC3339)
9595

96+
lastTxID := stub.Stub.GetTxID()
97+
(*a)["@lastTxID"] = lastTxID
98+
9699
return nil
97100
}
98101

‎test/assets_put_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func TestPutAsset(t *testing.T) {
2525
"@key": "person:47061146-c642-51a1-844a-bf0b17cb5e19",
2626
"@lastTouchBy": "org1MSP",
2727
"@lastTx": "",
28+
"@lastTxID": "TestPutAsset",
2829
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
2930
"@assetType": "person",
3031
"name": "Maria",
@@ -161,6 +162,7 @@ func TestPutNewAssetRecursive(t *testing.T) {
161162
"@lastTouchBy": "org1MSP",
162163
"@lastTx": "",
163164
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
165+
"@lastTxID": "TestPutAsset",
164166
"title": "Meu Nome é Maria",
165167
"author": "Maria Viana",
166168
"currentTenant": map[string]interface{}{
@@ -169,6 +171,7 @@ func TestPutNewAssetRecursive(t *testing.T) {
169171
"@lastTouchBy": "org1MSP",
170172
"@lastTx": "",
171173
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
174+
"@lastTxID": "TestPutAsset",
172175
"name": "Maria",
173176
"id": "31820792048",
174177
"height": 1.66,
@@ -190,6 +193,7 @@ func TestPutNewAssetRecursive(t *testing.T) {
190193
"@lastTouchBy": "org1MSP",
191194
"@lastTx": "",
192195
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
196+
"@lastTxID": "TestPutAsset",
193197
"title": "Meu Nome é Maria",
194198
"author": "Maria Viana",
195199
"currentTenant": map[string]interface{}{
@@ -270,6 +274,7 @@ func TestUpdateRecursive(t *testing.T) {
270274
"@lastTouchBy": "org1MSP",
271275
"@lastTx": "",
272276
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
277+
"@lastTxID": "TestUpdateAsset",
273278
"title": "Meu Nome é Maria",
274279
"author": "Maria Viana",
275280
"currentTenant": map[string]interface{}{
@@ -278,6 +283,7 @@ func TestUpdateRecursive(t *testing.T) {
278283
"@lastTouchBy": "org1MSP",
279284
"@lastTx": "",
280285
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
286+
"@lastTxID": "TestUpdateAsset",
281287
"name": "Maria",
282288
"id": "31820792048",
283289
"height": 1.88,
@@ -300,6 +306,7 @@ func TestUpdateRecursive(t *testing.T) {
300306
"@lastTouchBy": "org1MSP",
301307
"@lastTx": "",
302308
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
309+
"@lastTxID": "TestUpdateAsset",
303310
"title": "Meu Nome é Maria",
304311
"author": "Maria Viana",
305312
"currentTenant": map[string]interface{}{

‎test/tryout_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func TestTryout(t *testing.T) {
2727
"@lastTouchBy": "org1MSP",
2828
"@lastTx": "createAsset",
2929
"@assetType": "person",
30+
"@lastTxID": "createAsset",
3031
"name": "Maria",
3132
"id": "31820792048",
3233
"height": 0.0,
@@ -63,6 +64,7 @@ func TestTryout(t *testing.T) {
6364
"@lastTouchBy": "org2MSP",
6465
"@lastTx": "createAsset",
6566
"@assetType": "book",
67+
"@lastTxID": "createAsset",
6668
"title": "Meu Nome é Maria",
6769
"author": "Maria Viana",
6870
"currentTenant": map[string]interface{}{
@@ -116,6 +118,7 @@ func TestTryout(t *testing.T) {
116118
"@lastTouchBy": "org2MSP",
117119
"@lastTx": "updateAsset",
118120
"@assetType": "person",
121+
"@lastTxID": "updateAsset",
119122
"name": "Maria",
120123
"id": "31820792048",
121124
"height": 1.67,

‎test/tx_createAssetType_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ func TestCreateAssetType(t *testing.T) {
122122
"@lastTx": "createAsset",
123123
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
124124
"@assetType": "magazine",
125+
"@lastTxID": "createAsset",
125126
"name": "MAG",
126127
"images": []interface{}{
127128
"url.com/1",

‎test/tx_createAsset_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func TestCreateAsset(t *testing.T) {
3939
"@lastTx": "createAsset",
4040
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
4141
"@assetType": "person",
42+
"@lastTxID": "createAsset",
4243
"name": "Maria",
4344
"id": "31820792048",
4445
"height": 0.0,
@@ -139,6 +140,7 @@ func TestCreateAssetGenericAssociation(t *testing.T) {
139140
"@lastTx": "createAsset",
140141
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
141142
"@assetType": "person",
143+
"@lastTxID": "createAsset",
142144
"name": "Maria",
143145
"id": "31820792048",
144146
"height": 0.0,
@@ -250,6 +252,7 @@ func TestCreatePrivate(t *testing.T) {
250252
"@assetType": "secret",
251253
"@lastTouchBy": "org2MSP",
252254
"@lastTx": "createAsset",
255+
"@lastTxID": "createAsset",
253256
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
254257
"secretName": "testSecret",
255258
"secret": "this is very secret",

‎test/tx_updateAsset_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ func TestUpdateAsset(t *testing.T) {
7171
"@key": "person:47061146-c642-51a1-844a-bf0b17cb5e19",
7272
"@lastTouchBy": "org1MSP",
7373
"@lastTx": "updateAsset",
74+
"@lastTxID": "updateAsset",
7475
"@lastUpdated": lastUpdated.AsTime().Format(time.RFC3339),
7576
"@assetType": "person",
7677
"name": "Maria",

0 commit comments

Comments
 (0)