Skip to content

Commit

Permalink
feature(dep) Switch to Concerto 1.0 and Ergo 0.22
Browse files Browse the repository at this point in the history 
Signed-off-by: Jerome Simeon <[email protected]>
  • Loading branch information
@jeromesimeon
jeromesimeon committed Apr 27, 2021
1 parent 263ac11 commit db0b4ee
Show file tree
Hide file tree
Showing 135 changed files with 299 additions and 604 deletions.
108 changes: 54 additions & 54 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/cicero-cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@accordproject/cicero-engine": "0.22.0-alpha.9",
"@accordproject/cicero-test": "0.22.0-alpha.9",
"@accordproject/cicero-tools": "0.22.0-alpha.9",
"@accordproject/concerto-core": "1.0.0-alpha.10",
"@accordproject/concerto-core": "1.0.0",
"mkdirp": "0.5.1",
"uuid": "3.3.2",
"yargs": "13.2.4"
Expand Down
8 changes: 1 addition & 7 deletions ...cicero-cli/test/data/helloemit/model/@models.accordproject.org.accordproject.contract.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.contract

Expand All @@ -21,15 +21,9 @@ namespace org.accordproject.contract
* -- Describes the structure of contracts and clauses
*/

/* A party to a contract */
participant Party identified by partyId {
o String partyId
}

/* A contract is a asset -- This contains the contract data */
abstract asset Contract identified by contractId {
o String contractId
--> Party[] parties optional
}

/* A clause is an asset -- This contains the clause data */
Expand Down
3 changes: 1 addition & 2 deletions .../cicero-cli/test/data/helloemit/model/@models.accordproject.org.accordproject.runtime.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.runtime

import org.accordproject.contract.Party from https://models.accordproject.org/accordproject/contract.cto
import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto

/**
Expand Down
8 changes: 1 addition & 7 deletions ...-cli/test/data/helloworldstate/model/@models.accordproject.org.accordproject.contract.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.contract

Expand All @@ -21,15 +21,9 @@ namespace org.accordproject.contract
* -- Describes the structure of contracts and clauses
*/

/* A party to a contract */
participant Party identified by partyId {
o String partyId
}

/* A contract is a asset -- This contains the contract data */
abstract asset Contract identified by contractId {
o String contractId
--> Party[] parties optional
}

/* A clause is an asset -- This contains the clause data */
Expand Down
3 changes: 1 addition & 2 deletions ...o-cli/test/data/helloworldstate/model/@models.accordproject.org.accordproject.runtime.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.runtime

import org.accordproject.contract.Party from https://models.accordproject.org/accordproject/contract.cto
import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto

/**
Expand Down
8 changes: 1 addition & 7 deletions ...est/data/installment-sale-ergo/model/@models.accordproject.org.accordproject.contract.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.contract

Expand All @@ -21,15 +21,9 @@ namespace org.accordproject.contract
* -- Describes the structure of contracts and clauses
*/

/* A party to a contract */
participant Party identified by partyId {
o String partyId
}

/* A contract is a asset -- This contains the contract data */
abstract asset Contract identified by contractId {
o String contractId
--> Party[] parties optional
}

/* A clause is an asset -- This contains the clause data */
Expand Down
3 changes: 1 addition & 2 deletions ...test/data/installment-sale-ergo/model/@models.accordproject.org.accordproject.runtime.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.runtime

import org.accordproject.contract.Party from https://models.accordproject.org/accordproject/contract.cto
import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto

/**
Expand Down
8 changes: 1 addition & 7 deletions ...icero-cli/test/data/ip-payment/model/@models.accordproject.org.accordproject.contract.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.contract

Expand All @@ -21,15 +21,9 @@ namespace org.accordproject.contract
* -- Describes the structure of contracts and clauses
*/

/* A party to a contract */
participant Party identified by partyId {
o String partyId
}

/* A contract is a asset -- This contains the contract data */
abstract asset Contract identified by contractId {
o String contractId
--> Party[] parties optional
}

/* A clause is an asset -- This contains the clause data */
Expand Down
3 changes: 1 addition & 2 deletions ...cicero-cli/test/data/ip-payment/model/@models.accordproject.org.accordproject.runtime.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.runtime

import org.accordproject.contract.Party from https://models.accordproject.org/accordproject/contract.cto
import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto

/**
Expand Down
8 changes: 1 addition & 7 deletions ...st/data/latedeliveryandpenalty/model/@models.accordproject.org.accordproject.contract.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.contract

Expand All @@ -21,15 +21,9 @@ namespace org.accordproject.contract
* -- Describes the structure of contracts and clauses
*/

/* A party to a contract */
participant Party identified by partyId {
o String partyId
}

/* A contract is a asset -- This contains the contract data */
abstract asset Contract identified by contractId {
o String contractId
--> Party[] parties optional
}

/* A clause is an asset -- This contains the clause data */
Expand Down
3 changes: 1 addition & 2 deletions ...est/data/latedeliveryandpenalty/model/@models.accordproject.org.accordproject.runtime.cto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
* limitations under the License.
*/

concerto version ">= 1.0.0-alpha.3"
concerto version ">= 1.0.0"

namespace org.accordproject.runtime

import org.accordproject.contract.Party from https://models.accordproject.org/accordproject/contract.cto
import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto

/**
Expand Down
Loading

0 comments on commit db0b4ee

Please sign in to comment.