Release 0.1.0rc1 (#33)

System model updates required for composer 0.9.0 * updated models * correct the model files
hyperledger-archives · Jun 29, 2017 · 81394e3 · 81394e3
1 parent 301349a
commit 81394e3
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 48 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.0.18",
+  "version": "0.1.0",
   "hoist": true
 }
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "name": "sample-models",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "main": "index.js",
   "private": true,
   "scripts": {

diff --git a/packages/animaltracking-model/models/com.ibm.concerto.mozart.cto b/packages/animaltracking-model/models/com.ibm.concerto.mozart.cto
@@ -109,8 +109,7 @@ asset Business identified by sbi {
 /**
  * An abstract transaction type for animal movements
  */
-abstract transaction AnimalMovement identified by transactionId {
-  o String transactionId
+abstract transaction AnimalMovement {
   o String[] logs optional
     --> Animal animal
     --> Business from
@@ -131,6 +130,5 @@ transaction AnimalMovementArrival extends AnimalMovement {
   --> Field arrivalField
 }
 
-transaction SetupDemo identified by transactionId {
-  o String transactionId
+transaction SetupDemo  {
 }
diff --git a/packages/animaltracking-model/package.json b/packages/animaltracking-model/package.json
@@ -3,7 +3,7 @@
     "composer": "^0.9.0"
   },
   "name": "animaltracking-model",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Animal Tracking model based on UK DEFRA regulations",
   "scripts": {
     "licchk": "license-check",

diff --git a/packages/composer.base/package.json b/packages/composer.base/package.json
@@ -3,7 +3,7 @@
     "composer": "^0.9.0"
   },
   "name": "composer.base",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Composer Base Model",
   "repository": {
     "type": "git",

diff --git a/packages/composer.business/package.json b/packages/composer.business/package.json
@@ -3,10 +3,10 @@
     "composer": "^0.9.0"
   },
   "name": "composer.business",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Composer Business Model",
   "dependencies": {
-    "composer.base": "^0.0.18"
+    "composer.base": "^0.1.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/composer.contract/models/template.cto b/packages/composer.contract/models/template.cto
@@ -29,14 +29,12 @@ asset Template identified by id {
   o Clause[] clauses
 }
 
-transaction CreateTemplate identified by id {
-  o String id
+transaction CreateTemplate {
   o String description
   o Clause[] clauses
 }
 
-transaction UpdateTemplate identified by id {
-  o String id
+transaction UpdateTemplate  {
   o String description
   o Clause[] clauses
-}
+}
diff --git a/packages/composer.contract/package.json b/packages/composer.contract/package.json
@@ -3,10 +3,10 @@
     "composer": "^0.9.0"
   },
   "name": "composer.contract",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Composer Contract Model",
   "dependencies": {
-    "composer.business": "^0.0.18"
+    "composer.business": "^0.1.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/composer.finance/models/bond.cto b/packages/composer.finance/models/bond.cto
@@ -70,8 +70,7 @@ asset BondAsset identified by ISINCode {
     o Bond bond
 }
 
-transaction PublishBond identified by transactionId {
-  o String transactionId
+transaction PublishBond  {
   o String ISINCode
   o Bond bond
-}
+}
diff --git a/packages/composer.finance/package.json b/packages/composer.finance/package.json
@@ -3,11 +3,11 @@
     "composer": "^0.9.0"
   },
   "name": "composer.finance",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Composer Finance Model",
   "dependencies": {
-    "composer.base": "^0.0.18",
-    "composer.business": "^0.0.18"
+    "composer.base": "^0.1.0",
+    "composer.business": "^0.1.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/digitalproperty-model/models/DigitalLandTitle.cto b/packages/digitalproperty-model/models/DigitalLandTitle.cto
@@ -35,8 +35,7 @@ participant Person identified by personId {
 }
 
 
-transaction RegisterPropertyForSale identified by transactionId{
-  o String transactionId
+transaction RegisterPropertyForSale {
   --> Person seller
   --> LandTitle title
 }
diff --git a/packages/digitalproperty-model/package.json b/packages/digitalproperty-model/package.json
@@ -3,7 +3,7 @@
     "composer": "^0.9.0"
   },
   "name": "digitalproperty-model",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Digital Property Network",
   "scripts": {
     "licchk": "license-check",

diff --git a/packages/vehicle-lifecycle-model/models/manufacturer.cto b/packages/vehicle-lifecycle-model/models/manufacturer.cto
@@ -56,34 +56,30 @@ asset Order identified by orderId {
 /**
  * Transaction to create an order
  */
-transaction PlaceOrder identified by transactionId {
-  o String transactionId
+transaction PlaceOrder {
   o String orderId
   o VehicleDetails vehicleDetails
   --> Manufacturer manufacturer
   --> Person orderer
 }
 
-event PlaceOrderEvent identified by eventId{
-  o String eventId
+event PlaceOrderEvent {
   o String orderId
   o VehicleDetails vehicleDetails
 }
 
 /**
  * Transaction to update the status of an order
  */
-transaction UpdateOrderStatus identified by transactionId {
-  o String transactionId
+transaction UpdateOrderStatus{
   o OrderStatus orderStatus
   o String vin optional
   o String v5c optional
   o String numberPlate optional
   --> Order order
 }
 
-event UpdateOrderStatusEvent identified by eventId{
-  o String eventId
+event UpdateOrderStatusEvent {
   o OrderStatus orderStatus
   o Order order
-}
+}
diff --git a/packages/vehicle-lifecycle-model/models/vda.cto b/packages/vehicle-lifecycle-model/models/vda.cto
@@ -93,17 +93,15 @@ concept VehicleTransferLogEntry {
 /**
  * Based on the DVLA V62 document
  */
-transaction ApplicationForVehicleRegistrationCertificate identified by transactionId {
-  o String transactionId
+transaction ApplicationForVehicleRegistrationCertificate {
   o VehicleDetails vehicleDetails
   --> Person keeper
   o String dvlaFleetNumber optional
   o String driversLicenseNumber optional
   o Long mileage optional
   o String previousPostCode optional
 }
-abstract transaction VehicleTransaction identified by transactionId {
-  o String transactionId
+abstract transaction VehicleTransaction  {
   --> Vehicle vehicle
 }
 /**
@@ -134,11 +132,9 @@ transaction ScrapVehicle extends VehicleTransaction {
 transaction UpdateSuspicious extends VehicleTransaction {
   o String message
 }
-transaction ScrapAllVehiclesByColour identified by transactionId {
-  o String transactionId
+transaction ScrapAllVehiclesByColour  {
   o String colour
 }
-event ScrapVehicleEvent identified by eventId {
-  o String eventId
+event ScrapVehicleEvent {
   --> Vehicle vehicle
-}
+}
diff --git a/packages/vehicle-lifecycle-model/models/vehicle.cto b/packages/vehicle-lifecycle-model/models/vehicle.cto
@@ -37,6 +37,5 @@ participant AuctionHouse extends Company {
 participant ScrapMerchant extends Company {
 }
 
-transaction SetupDemo identified by transactionId {
-  o String transactionId
+transaction SetupDemo  {
 }
diff --git a/packages/vehicle-lifecycle-model/package.json b/packages/vehicle-lifecycle-model/package.json
@@ -3,7 +3,7 @@
     "composer": "^0.9.0"
   },
   "name": "vehicle-lifecycle-model",
-  "version": "0.0.18",
+  "version": "0.1.0",
   "description": "Vehicle Lifecycle Model",
   "repository": {
     "type": "git",

diff --git a/scripts/pkgbump.js b/scripts/pkgbump.js
@@ -24,4 +24,4 @@ const lernaConfigFile = path.resolve(lernaDirectory, 'lerna.json');
 const lernaConfig = require(lernaConfigFile);
 const targetVersion = semver.inc(lernaConfig.version, 'patch');
 lernaConfig.version = targetVersion;
-fs.writeFileSync(lernaConfigFile, JSON.stringify(lernaConfig, null, 2), 'utf8');
+fs.writeFileSync(lernaConfigFile, JSON.stringify(lernaConfig, null, 2), 'utf8');