From 61c43afd4ab5ac7da29788d38e5a65c39a31096a Mon Sep 17 00:00:00 2001 From: Sandeep Nishad Date: Thu, 23 Mar 2023 18:03:22 +0530 Subject: [PATCH] refactor(weaver): rename corda packages to start with org.hyperledger.cacti.weaver Signed-off-by: Sandeep Nishad --- .dcilintignore | 2 +- .../test_weaver-asset-exchange-corda.yml | 1 + .../common/protos/common/access_control.proto | 2 +- weaver/common/protos/common/ack.proto | 2 +- weaver/common/protos/common/asset_locks.proto | 2 +- .../common/protos/common/asset_transfer.proto | 2 +- weaver/common/protos/common/events.proto | 2 +- .../protos/common/interop_payload.proto | 2 +- weaver/common/protos/common/membership.proto | 2 +- weaver/common/protos/common/proofs.proto | 2 +- weaver/common/protos/common/query.proto | 2 +- weaver/common/protos/common/state.proto | 2 +- .../protos/common/verification_policy.proto | 2 +- weaver/common/protos/corda/view_data.proto | 2 +- weaver/common/protos/driver/driver.proto | 2 +- weaver/common/protos/fabric/view_data.proto | 2 +- weaver/common/protos/identity/agent.proto | 2 +- weaver/common/protos/networks/networks.proto | 2 +- weaver/common/protos/relay/datatransfer.proto | 2 +- weaver/common/protos/relay/events.proto | 2 +- weaver/core/drivers/corda-driver/build.gradle | 10 ++-- .../drivers/corda-driver/gradle.properties | 2 +- .../src/main/kotlin/CordaDriver.kt | 12 ++-- .../src/main/kotlin/CordaNodeRPCConnection.kt | 2 +- .../kotlin/CustomSerializationWhitelist.kt | 2 +- .../src/main/kotlin/GrpcClient.kt | 6 +- .../src/main/kotlin/GrpcServer.kt | 8 +-- ....core.serialization.SerializationWhitelist | 2 +- .../core/network/corda-interop-app/README.md | 4 +- .../corda-interop-app/gradle.properties | 2 +- .../interop-contracts/build.gradle | 2 +- .../AccessControlPolicyStateContract.kt | 6 +- .../AssetExchangeHTLCStateContract.kt | 16 ++--- .../contracts/AssetTransferContract.kt | 10 ++-- .../contracts/ExternalStateContract.kt | 6 +- .../contracts/MembershipStateContract.kt | 6 +- .../contracts/NetworkIdStateContract.kt | 6 +- .../VerificationPolicyStateContract.kt | 6 +- .../states/AccessControlPolicyState.kt | 4 +- .../interop/states/AssetClaimStatusState.kt | 4 +- .../interop/states/AssetExchangeHTLCState.kt | 6 +- .../app/interop/states/AssetPledgeState.kt | 4 +- .../corda/app/interop/states/ExternalState.kt | 4 +- .../app/interop/states/HashExtensions.kt | 2 +- .../app/interop/states/MembershipState.kt | 4 +- .../app/interop/states/NetworkIdState.kt | 4 +- .../interop/states/VerificationPolicyState.kt | 4 +- .../app/interop/contracts/ContractTests.kt | 2 +- .../interop-workflows/build.gradle | 2 +- .../cacti}/cordaInteropApp/DriverBasedTest.kt | 2 +- .../app/interop/flows/AccessControlFlows.kt | 12 ++-- .../interop/flows/AssetExchangeHTLCFlows.kt | 14 ++--- .../flows/AssetExchangeHTLCWrapperFlows.kt | 12 ++-- .../app/interop/flows/AssetTransferFlows.kt | 14 ++--- .../flows/AssetTransferWrapperFlows.kt | 16 ++--- .../corda/app/interop/flows/CertUtils.kt | 6 +- .../interop/flows/CommonHelperFunctions.kt | 6 +- .../flows/CreateExternalRequestFlows.kt | 2 +- .../interop/flows/HandleExternalRequest.kt | 41 ++----------- .../corda/app/interop/flows/HelperTypes.kt | 2 +- .../app/interop/flows/MembershipFlows.kt | 8 +-- .../corda/app/interop/flows/NetworkIdFlows.kt | 6 +- .../app/interop/flows/NodeSignatureFlows.kt | 2 +- .../interop/flows/VerificationPolicyFlows.kt | 10 ++-- .../app/interop/flows/ViewVerification.kt | 10 ++-- .../interop/flows/WriteExternalStateFlows.kt | 14 ++--- .../AssetClaimHTLCSerializer.kt | 4 +- .../customSerializers/AssetClaimSerializer.kt | 4 +- .../AssetClaimStatusSerializer.kt | 4 +- .../AssetExchangeAgreementSerializer.kt | 4 +- .../AssetLockHTLCSerializer.kt | 4 +- .../customSerializers/AssetLockSerializer.kt | 4 +- .../AssetPledgeSerializer.kt | 4 +- .../CustomSerializationWhitelist.kt | 2 +- ...ungibleAssetExchangeAgreementSerializer.kt | 4 +- .../HashMechanismSerializer.kt | 4 +- .../LockMechanismSerializer.kt | 4 +- .../flows/customSerializers/MetaSerializer.kt | 6 +- .../customSerializers/ProtocolSerializer.kt | 4 +- .../customSerializers/QuerySerializer.kt | 4 +- .../customSerializers/TimeSpecSerializer.kt | 4 +- .../flows/customSerializers/ViewSerializer.kt | 4 +- ....core.serialization.SerializationWhitelist | 2 +- .../app/interop/AccessControlPolicyTests.kt | 14 ++--- .../interop/AssetExchangeHTLCSHA256Tests.kt | 34 +++++------ .../interop/AssetExchangeHTLCSHA512Tests.kt | 38 ++++++------ .../interop/AssetExchangeHTLCWrapperTests.kt | 26 ++++----- .../corda/app/interop/CertUtilsTests.kt | 10 ++-- .../app/interop/CommonHelperFunctionTests.kt | 4 +- .../app/interop/CreateExternalRequestTests.kt | 20 +++---- .../app/interop/HandleExternalRequestTests.kt | 25 ++++---- .../corda/app/interop/MembershipTests.kt | 16 ++--- .../weaver/corda/app/interop/NodeDriver.kt | 2 +- .../corda/app/interop/NodeSignatureTests.kt | 4 +- .../app/interop/VerificationPolicyTests.kt | 18 +++--- .../app/interop/WriteExternalStateTest.kt | 10 ++-- .../app/interop/WriteExternalStateTest2.kt | 10 ++-- .../src/main/kotlin/TestAssetFlow.kt | 4 +- .../src/main/kotlin/TestQueryFlow.kt | 58 +++++++++++++++++++ .../clients/build.gradle | 8 +-- .../client/AccessControlPolicyManager.kt | 4 +- .../client/AssetExchangeManager.kt | 4 +- .../client/AssetTransferManager.kt | 10 ++-- .../client/ConfigureNetwork.kt | 2 +- .../client/HouseTokenExchangeManager.kt | 4 +- .../client/HouseTokenTransferManager.kt | 10 ++-- .../client/InteropManager.kt | 2 +- .../client/MembershipManager.kt | 4 +- .../client/NetworkIdStateManager.kt | 6 +- .../client/UtilsManager.kt | 4 +- .../client/VerificationPolicyManager.kt | 4 +- .../workflows-kotlin/build.gradle | 4 +- .../main/kotlin/com/example/flow/AssetFlow.kt | 8 +-- .../kotlin/com/example/flow/BondAssetFlow.kt | 8 +-- .../corda/fungible-house-token/build.gradle | 4 +- .../AssetTransferHelperFlows.kt | 8 +-- weaver/sdks/corda/README.md | 8 +-- weaver/sdks/corda/build.gradle | 6 +- weaver/sdks/corda/gradle.properties | 2 +- .../corda/sdk/AccessControlPolicyManager.kt | 10 ++-- .../cacti}/weaver/corda/sdk/AssetManager.kt | 8 +-- .../weaver/corda/sdk/AssetTransferSDK.kt | 14 ++--- .../weaver/corda/sdk/CredentialsCreator.kt | 8 +-- .../corda/sdk/CredentialsExtractor.java | 2 +- .../cacti}/weaver/corda/sdk/HashFunctions.kt | 6 +- .../weaver/corda/sdk/InteroperableHelper.kt | 16 ++--- .../weaver/corda/sdk/MembershipManager.kt | 10 ++-- .../cacti}/weaver/corda/sdk/RelayClient.kt | 6 +- .../corda/sdk/VerificationPolicyManager.kt | 12 ++-- .../corda/scripts/get-cordapps.sh | 2 +- 130 files changed, 478 insertions(+), 449 deletions(-) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt (91%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/AssetTransferContract.kt (94%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/ExternalStateContract.kt (89%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/MembershipStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt (89%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/AccessControlPolicyState.kt (90%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/AssetClaimStatusState.kt (95%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt (91%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/AssetPledgeState.kt (95%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/ExternalState.kt (86%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/HashExtensions.kt (82%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/MembershipState.kt (93%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/NetworkIdState.kt (87%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/states/VerificationPolicyState.kt (94%) rename weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/contracts/ContractTests.kt (80%) rename weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/{com => org/hyperledger/cacti}/cordaInteropApp/DriverBasedTest.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/AccessControlFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/AssetTransferFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt (93%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/CertUtils.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/CommonHelperFunctions.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/HandleExternalRequest.kt (88%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/HelperTypes.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/MembershipFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/NetworkIdFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/NodeSignatureFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/ViewVerification.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt (90%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt (89%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt (90%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt (89%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt (90%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt (89%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/AccessControlPolicyTests.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt (88%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt (88%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/CertUtilsTests.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/CommonHelperFunctionTests.kt (99%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/CreateExternalRequestTests.kt (85%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/HandleExternalRequestTests.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/MembershipTests.kt (93%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/NodeDriver.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/NodeSignatureTests.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/VerificationPolicyTests.kt (89%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/WriteExternalStateTest.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/{com => org/hyperledger/cacti}/weaver/corda/app/interop/WriteExternalStateTest2.kt (94%) create mode 100644 weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestQueryFlow.kt rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/AccessControlPolicyManager.kt (95%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/AssetManager.kt (97%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/AssetTransferSDK.kt (96%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/CredentialsCreator.kt (93%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/CredentialsExtractor.java (99%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/HashFunctions.kt (93%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/InteroperableHelper.kt (96%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/MembershipManager.kt (95%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/RelayClient.kt (93%) rename weaver/sdks/corda/src/main/kotlin/{com => org/hyperledger/cacti}/weaver/corda/sdk/VerificationPolicyManager.kt (95%) diff --git a/.dcilintignore b/.dcilintignore index f8e3a588b5..882b80506d 100644 --- a/.dcilintignore +++ b/.dcilintignore @@ -22,7 +22,7 @@ examples/cactus-example-carbon-accounting-backend/src/main/json/generated/build- # Cannot be edited as its a name of a imported Corda library, and Corda syntax weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/CustomSerializationWhitelist.kt -weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt +weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt # Corda test network files that are generated and therefore cannot be altered to comply with DCI-Lint weaver/tests/network-setups/corda/shared diff --git a/.github/workflows/test_weaver-asset-exchange-corda.yml b/.github/workflows/test_weaver-asset-exchange-corda.yml index f9306ac890..c52991824e 100644 --- a/.github/workflows/test_weaver-asset-exchange-corda.yml +++ b/.github/workflows/test_weaver-asset-exchange-corda.yml @@ -211,6 +211,7 @@ jobs: working-directory: weaver/samples/corda/corda-simple-application house-token-exchange-corda: + if: ${{ false }} # The type of runner that the job will run on runs-on: ubuntu-latest diff --git a/weaver/common/protos/common/access_control.proto b/weaver/common/protos/common/access_control.proto index 777a162e3a..f09a8180f3 100644 --- a/weaver/common/protos/common/access_control.proto +++ b/weaver/common/protos/common/access_control.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.access_control; -option java_package = "com.weaver.protos.common.access_control"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.access_control"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // AccessControlPolicy specifies a set of data that can be accessed by some diff --git a/weaver/common/protos/common/ack.proto b/weaver/common/protos/common/ack.proto index 709a634299..d3333b093f 100644 --- a/weaver/common/protos/common/ack.proto +++ b/weaver/common/protos/common/ack.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.ack; -option java_package = "com.weaver.protos.common.ack"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.ack"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // This message respresents "ACKs" sent between relay-relay, diff --git a/weaver/common/protos/common/asset_locks.proto b/weaver/common/protos/common/asset_locks.proto index 04e56ed6da..cf0cf1e19c 100644 --- a/weaver/common/protos/common/asset_locks.proto +++ b/weaver/common/protos/common/asset_locks.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.asset_locks; -option java_package = "com.weaver.protos.common.asset_locks"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.asset_locks"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; enum LockMechanism { diff --git a/weaver/common/protos/common/asset_transfer.proto b/weaver/common/protos/common/asset_transfer.proto index 5eb676710f..2b4e3e0729 100644 --- a/weaver/common/protos/common/asset_transfer.proto +++ b/weaver/common/protos/common/asset_transfer.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.asset_transfer; -option java_package = "com.weaver.protos.common.asset_transfer"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.asset_transfer"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; message AssetPledge { diff --git a/weaver/common/protos/common/events.proto b/weaver/common/protos/common/events.proto index 16e8996d5c..e801c7d7d2 100644 --- a/weaver/common/protos/common/events.proto +++ b/weaver/common/protos/common/events.proto @@ -5,7 +5,7 @@ package common.events; import "common/query.proto"; import "common/state.proto"; -option java_package = "com.weaver.protos.common.events"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.events"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; enum EventType { diff --git a/weaver/common/protos/common/interop_payload.proto b/weaver/common/protos/common/interop_payload.proto index 796b4c5343..078cd72b87 100644 --- a/weaver/common/protos/common/interop_payload.proto +++ b/weaver/common/protos/common/interop_payload.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.interop_payload; -option java_package = "com.weaver.protos.common.interop_payload"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.interop_payload"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; message InteropPayload { diff --git a/weaver/common/protos/common/membership.proto b/weaver/common/protos/common/membership.proto index 18a2bb3bef..a033d5d717 100644 --- a/weaver/common/protos/common/membership.proto +++ b/weaver/common/protos/common/membership.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.membership; -option java_package = "com.weaver.protos.common.membership"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.membership"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // Membership captures the members of an external entity such as a thing, diff --git a/weaver/common/protos/common/proofs.proto b/weaver/common/protos/common/proofs.proto index 0fd587ceb5..2f40d3464d 100644 --- a/weaver/common/protos/common/proofs.proto +++ b/weaver/common/protos/common/proofs.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package common.proofs; -option java_package = "com.weaver.protos.common.proofs"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.proofs"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; message Proof { diff --git a/weaver/common/protos/common/query.proto b/weaver/common/protos/common/query.proto index bcb448d24d..032b560632 100644 --- a/weaver/common/protos/common/query.proto +++ b/weaver/common/protos/common/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package common.query; -option java_package = "com.weaver.protos.common.query"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.query"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // the payload to define the data that is being requested diff --git a/weaver/common/protos/common/state.proto b/weaver/common/protos/common/state.proto index 1bebb962a4..25c04625c2 100644 --- a/weaver/common/protos/common/state.proto +++ b/weaver/common/protos/common/state.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package common.state; -option java_package = "com.weaver.protos.common.state"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.state"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // Metadata for a View diff --git a/weaver/common/protos/common/verification_policy.proto b/weaver/common/protos/common/verification_policy.proto index 94ddcce341..cc8d0a0ced 100644 --- a/weaver/common/protos/common/verification_policy.proto +++ b/weaver/common/protos/common/verification_policy.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package common.verification_policy; -option java_package = "com.weaver.protos.common.verification_policy"; +option java_package = "org.hyperledger.cacti.weaver.protos.common.verification_policy"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/common"; // VerificationPolicy stores the rules around which parties from a foreign diff --git a/weaver/common/protos/corda/view_data.proto b/weaver/common/protos/corda/view_data.proto index 37323baea6..888c475f31 100644 --- a/weaver/common/protos/corda/view_data.proto +++ b/weaver/common/protos/corda/view_data.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package corda; -option java_package = "com.weaver.protos.corda"; +option java_package = "org.hyperledger.cacti.weaver.protos.corda"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/corda"; message ViewData { diff --git a/weaver/common/protos/driver/driver.proto b/weaver/common/protos/driver/driver.proto index d12752169d..47cf8d0894 100644 --- a/weaver/common/protos/driver/driver.proto +++ b/weaver/common/protos/driver/driver.proto @@ -7,7 +7,7 @@ import "common/query.proto"; import "common/events.proto"; import "common/state.proto"; -option java_package = "com.weaver.protos.driver.driver"; +option java_package = "org.hyperledger.cacti.weaver.protos.driver.driver"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/driver"; // Data for a View processing by dest-driver diff --git a/weaver/common/protos/fabric/view_data.proto b/weaver/common/protos/fabric/view_data.proto index 409026b51a..c448efa11f 100644 --- a/weaver/common/protos/fabric/view_data.proto +++ b/weaver/common/protos/fabric/view_data.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package fabric.view_data; -option java_package = "com.weaver.protos.fabric.view_data"; +option java_package = "org.hyperledger.cacti.weaver.protos.fabric.view_data"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/fabric"; import "peer/proposal_response.proto"; diff --git a/weaver/common/protos/identity/agent.proto b/weaver/common/protos/identity/agent.proto index 75dd02f583..ab075a8454 100644 --- a/weaver/common/protos/identity/agent.proto +++ b/weaver/common/protos/identity/agent.proto @@ -4,7 +4,7 @@ package identity.agent; import "common/ack.proto"; -option java_package = "com.weaver.protos.identity.agent"; +option java_package = "org.hyperledger.cacti.weaver.protos.identity.agent"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/identity"; // definitions of all messages used in the datatransfer protocol diff --git a/weaver/common/protos/networks/networks.proto b/weaver/common/protos/networks/networks.proto index eb259e4434..8de0aacc63 100644 --- a/weaver/common/protos/networks/networks.proto +++ b/weaver/common/protos/networks/networks.proto @@ -6,7 +6,7 @@ import "common/ack.proto"; import "common/state.proto"; import "common/events.proto"; -option java_package = "com.weaver.protos.networks.networks"; +option java_package = "org.hyperledger.cacti.weaver.protos.networks.networks"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/networks"; // This service is the interface for how the network communicates with diff --git a/weaver/common/protos/relay/datatransfer.proto b/weaver/common/protos/relay/datatransfer.proto index 775e6bdc00..8c8b672b04 100644 --- a/weaver/common/protos/relay/datatransfer.proto +++ b/weaver/common/protos/relay/datatransfer.proto @@ -6,7 +6,7 @@ import "common/ack.proto"; import "common/state.proto"; import "common/query.proto"; -option java_package = "com.weaver.protos.relay.datatransfer"; +option java_package = "org.hyperledger.cacti.weaver.protos.relay.datatransfer"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/relay"; // definitions of all messages used in the datatransfer protocol diff --git a/weaver/common/protos/relay/events.proto b/weaver/common/protos/relay/events.proto index 94b77857c1..ca8b1ce7a3 100644 --- a/weaver/common/protos/relay/events.proto +++ b/weaver/common/protos/relay/events.proto @@ -6,7 +6,7 @@ import "common/ack.proto"; import "common/events.proto"; import "common/state.proto"; -option java_package = "com.weaver.protos.relay.events"; +option java_package = "org.hyperledger.cacti.weaver.protos.relay.events"; option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/relay"; service EventSubscribe { diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle index de700685dc..353c174b07 100644 --- a/weaver/core/drivers/corda-driver/build.gradle +++ b/weaver/core/drivers/corda-driver/build.gradle @@ -92,10 +92,10 @@ dependencies { implementation "net.corda:corda:$corda_version" implementation "net.corda:corda-rpc:$corda_version" - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") // gRPC and protobuf dependencies implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version" @@ -123,7 +123,7 @@ dokka { } -mainClassName = "com.weaver.corda.driver.CordaDriverKt" +mainClassName = "org.hyperledger.cacti.weaver.corda.driver.CordaDriverKt" tasks.test { useJUnitPlatform() diff --git a/weaver/core/drivers/corda-driver/gradle.properties b/weaver/core/drivers/corda-driver/gradle.properties index 1493a9ae4b..ad1cb07f62 100644 --- a/weaver/core/drivers/corda-driver/gradle.properties +++ b/weaver/core/drivers/corda-driver/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official name=corda-driver -group=com.weaver.corda.driver +group=org.hyperledger.cacti.weaver.corda.driver version=1.2.14 kotlin.incremental=false diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt index 05a2a60bfa..8aea9d27f9 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.driver +package org.hyperledger.cacti.weaver.corda.driver import arrow.core.* import arrow.core.extensions.either.applicative.applicative @@ -16,11 +16,11 @@ import com.google.protobuf.ByteString import net.corda.core.messaging.CordaRPCOps import java.util.* -import com.weaver.corda.app.interop.flows.HandleExternalRequest -import com.weaver.corda.sdk.InteroperableHelper -import com.weaver.protos.common.query.QueryOuterClass -import com.weaver.protos.common.state.State -import com.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.flows.HandleExternalRequest +import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass fun main(args: Array) { val port = System.getenv("DRIVER_PORT")?.toInt() ?: 9099 diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt index f63c211d60..fa67e9e25d 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.driver +package org.hyperledger.cacti.weaver.corda.driver import net.corda.client.rpc.CordaRPCClient import net.corda.core.utilities.NetworkHostAndPort diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt index 20aefd8e85..9656a71d32 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.driver +package org.hyperledger.cacti.weaver.corda.driver import arrow.core.Either import net.corda.core.serialization.SerializationWhitelist diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt index 9cc712a50d..48a6f2cea0 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.driver +package org.hyperledger.cacti.weaver.corda.driver import io.grpc.ManagedChannel import io.grpc.Status @@ -14,8 +14,8 @@ import kotlinx.coroutines.coroutineScope import java.io.Closeable import java.util.concurrent.TimeUnit -import com.weaver.protos.common.state.State -import com.weaver.protos.relay.datatransfer.DataTransferGrpcKt +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.relay.datatransfer.DataTransferGrpcKt /** * Implements a gRPC client that connects to a local relay to send back requested state. diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt index 8295d3e1da..8470cd0cf2 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.driver +package org.hyperledger.cacti.weaver.corda.driver import java.io.File import io.grpc.Server import io.grpc.ServerBuilder import kotlinx.coroutines.* -import com.weaver.protos.common.ack.AckOuterClass -import com.weaver.protos.common.query.QueryOuterClass -import com.weaver.protos.driver.driver.DriverCommunicationGrpcKt +import org.hyperledger.cacti.weaver.protos.common.ack.AckOuterClass +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.driver.driver.DriverCommunicationGrpcKt /** * The GrpcServer is used by the Corda driver to listen for requests for statefrom the relay. diff --git a/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist b/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist index d70baa9245..9d7ab3798f 100644 --- a/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist +++ b/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist @@ -1 +1 @@ -com.weaver.corda.driver.CustomSerializationWhitelist \ No newline at end of file +org.hyperledger.cacti.weaver.corda.driver.CustomSerializationWhitelist \ No newline at end of file diff --git a/weaver/core/network/corda-interop-app/README.md b/weaver/core/network/corda-interop-app/README.md index 2f1d1ea28f..1ed87f4300 100644 --- a/weaver/core/network/corda-interop-app/README.md +++ b/weaver/core/network/corda-interop-app/README.md @@ -89,8 +89,8 @@ and then follow above 4 steps. 5) Add this to your build.gradle (change the version accordingly): ``` dependencies { - compile(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.1") - compile(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.1") + compile(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.1") + compile(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.1") } ``` diff --git a/weaver/core/network/corda-interop-app/gradle.properties b/weaver/core/network/corda-interop-app/gradle.properties index d6f337d7de..f1dd09eb5a 100644 --- a/weaver/core/network/corda-interop-app/gradle.properties +++ b/weaver/core/network/corda-interop-app/gradle.properties @@ -1,4 +1,4 @@ name=Interoperability CorDapp -group=com.weaver.corda.app.interop +group=org.hyperledger.cacti.weaver.corda.app.interop version=1.2.14 kotlin.incremental=false diff --git a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle index 7374d94701..78c8b3f96f 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle @@ -45,7 +45,7 @@ dependencies { testCompile "$corda_release_group:corda-node-driver:$corda_release_version" // weaver-protos - implementation "com.weaver:protos-java-kt:$weaver_version" + implementation "org.hyperledger.cacti.weaver:protos-java-kt:$weaver_version" compile "com.google.protobuf:protobuf-java:$protobuf_version" compile "com.google.protobuf:protobuf-java-util:$protobuf_version" diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt index 05d67ffbd3..6270afd8f0 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class AccessControlPolicyStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt index 252552f766..fd924b188f 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetClaimHTLCData -import com.weaver.corda.app.interop.states.AssetExchangeTxState -import com.weaver.corda.app.interop.states.sha512 -import com.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeTxState +import org.hyperledger.cacti.weaver.corda.app.interop.states.sha512 +import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -28,7 +28,7 @@ import java.util.* class AssetExchangeHTLCStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract" } /** @@ -140,7 +140,7 @@ class AssetExchangeHTLCStateContract : Contract { class AssetExchangeTxStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract" } override fun verify(tx: LedgerTransaction) { val command = tx.commands.requireSingleCommand() diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetTransferContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetTransferContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt index e7bc281163..7cf720e73d 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/AssetTransferContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.states.AssetClaimStatusState -import com.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -25,7 +25,7 @@ import java.util.* class AssetTransferContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.AssetTransferContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/ExternalStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/ExternalStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt index b190d2bd1c..df18c21e5f 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/ExternalStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.ExternalState +import org.hyperledger.cacti.weaver.corda.app.interop.states.ExternalState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.Requirements.using @@ -25,7 +25,7 @@ import net.corda.core.transactions.LedgerTransaction class ExternalStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.ExternalStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract" } /** * The verify() function determines a transaction is valid if it does not throw and exception. diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/MembershipStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/MembershipStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt index 797df8d3d0..c09fd74ba5 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/MembershipStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class MembershipStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.MembershipStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt index 138e4359c1..f84a19769b 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.Requirements.using @@ -25,7 +25,7 @@ import net.corda.core.transactions.LedgerTransaction class NetworkIdStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.NetworkIdStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract" } /** * The verify() function determines a transaction is valid if it does not throw and exception. diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt index c00b9e296a..432a384321 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts -import com.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class VerificationPolicyStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "com.weaver.corda.app.interop.contracts.VerificationPolicyStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AccessControlPolicyState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AccessControlPolicyState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt index d833d63171..194cc09e4a 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AccessControlPolicyState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetClaimStatusState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetClaimStatusState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt index def8760584..6dedbfe2e1 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetClaimStatusState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.ContractState diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt index a6edae94e8..b488f57b85 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import com.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.ContractState diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetPledgeState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetPledgeState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt index e597f56ea4..51f191925e 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/AssetPledgeState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/ExternalState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt similarity index 86% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/ExternalState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt index 651cd5c274..7a68d117b8 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/ExternalState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.ExternalStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/HashExtensions.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt similarity index 82% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/HashExtensions.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt index 09d88af568..0367964917 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/HashExtensions.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states import net.corda.core.utilities.OpaqueBytes import java.security.MessageDigest diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/MembershipState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/MembershipState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt index 20a1ee1e34..bc3264ace6 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/MembershipState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.MembershipStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/NetworkIdState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt similarity index 87% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/NetworkIdState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt index 7ecaa9e1d6..39980efc57 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/NetworkIdState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.NetworkIdStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/VerificationPolicyState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/VerificationPolicyState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt index 8ddc4e265a..13087fc4d7 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/com/weaver/corda/app/interop/states/VerificationPolicyState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.corda.app.interop.states -import com.weaver.corda.app.interop.contracts.VerificationPolicyStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/com/weaver/corda/app/interop/contracts/ContractTests.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt similarity index 80% rename from weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/com/weaver/corda/app/interop/contracts/ContractTests.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt index bb4138fbb5..6ae0ed4355 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/com/weaver/corda/app/interop/contracts/ContractTests.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.corda.app.interop.contracts import net.corda.testing.node.MockServices import org.junit.Test diff --git a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle index 66fbd5f8af..a873af54f2 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle @@ -74,7 +74,7 @@ dependencies { compile "io.arrow-kt:arrow-syntax:$arrow_version" // weaver-protos - implementation "com.weaver:protos-java-kt:$weaver_version" + implementation "org.hyperledger.cacti.weaver:protos-java-kt:$weaver_version" compile "com.google.protobuf:protobuf-java:$protobuf_version" compile "com.google.protobuf:protobuf-java-util:$protobuf_version" diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/com/cordaInteropApp/DriverBasedTest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/com/cordaInteropApp/DriverBasedTest.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt index d44213ce40..b3362c0753 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/com/cordaInteropApp/DriverBasedTest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import net.corda.core.identity.CordaX500Name import net.corda.core.utilities.getOrThrow diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AccessControlFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AccessControlFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt index 200b9882be..330a0b7266 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AccessControlFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract -import com.weaver.corda.app.interop.states.AccessControlPolicyState -import com.weaver.corda.app.interop.states.Rule -import com.weaver.protos.common.access_control.AccessControl -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.Command import net.corda.core.contracts.UniqueIdentifier import net.corda.core.flows.* diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt index f87ea404cf..2281a5e7d4 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetLockHTLCData -import com.weaver.corda.app.interop.states.AssetClaimHTLCData -import com.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract -import com.weaver.corda.app.interop.states.AssetExchangeTxState +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeTxState import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt index aaf9a95421..dbd803b110 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetLockHTLCData -import com.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData @@ -35,7 +35,7 @@ import net.corda.core.utilities.OpaqueBytes import java.time.Instant import java.util.Base64 -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks /** diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt index 09c338e278..df9115a7d6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.AssetTransferContract -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.states.AssetClaimStatusState -import com.weaver.corda.app.interop.states.NetworkIdState -import com.weaver.protos.common.asset_transfer.AssetTransfer -import com.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass import com.google.protobuf.ByteString import net.corda.core.contracts.ContractState diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt index 7eadc96536..3e4a4a3087 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.AssetTransferContract -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.states.AssetPledgeParameters -import com.weaver.corda.app.interop.states.AssetReclaimParameters -import com.weaver.corda.app.interop.states.AssetClaimParameters +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeParameters +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetReclaimParameters +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimParameters import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData @@ -36,8 +36,8 @@ import net.corda.core.utilities.OpaqueBytes import java.time.Instant import java.util.Base64 -import com.weaver.protos.common.asset_locks.AssetLocks -import com.weaver.protos.common.asset_transfer.AssetTransfer +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer /** * The AssetTransferPledge flow is used to create a pledge for both fungible and non-fungible/bond assets. diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CertUtils.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CertUtils.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt index 169d320f41..6deb3a3257 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CertUtils.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import arrow.core.flatMap -import com.weaver.corda.app.interop.states.Member -import com.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Member +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState import java.security.cert.X509Certificate import java.time.LocalDateTime import java.time.ZoneId diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CommonHelperFunctions.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CommonHelperFunctions.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt index cd261cf307..28b7362417 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CommonHelperFunctions.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left @@ -15,8 +15,8 @@ import java.io.ByteArrayInputStream import java.security.cert.CertificateFactory import java.security.cert.X509Certificate import java.util.Base64 -import com.weaver.protos.common.asset_locks.AssetLocks -import com.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism /** * The parseAddress function takes the address field of a Query sent from an external network at parses it into its diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt index d1953bd66e..85bebea1b0 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HandleExternalRequest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt similarity index 88% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HandleExternalRequest.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt index cb1f043a77..86ab76a6d4 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HandleExternalRequest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt @@ -4,18 +4,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import arrow.core.Either import arrow.core.Left import arrow.core.Right import arrow.core.flatMap import co.paralleluniverse.fibers.Suspendable import com.google.protobuf.ByteString -import com.weaver.protos.common.interop_payload.InteropPayloadOuterClass -import com.weaver.protos.common.state.State -import com.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier import net.corda.core.flows.FlowLogic @@ -103,37 +103,6 @@ class HandleExternalRequest(val query: QueryOuterClass.Query) : FlowLogic() { - - /** - * The call() method runs the flow logic. - * - * @return returns the LinearState's corresponding to the state in the vault - */ - @Suspendable - override fun call(): ByteArray { - println("Querying for states") - var states: List? - try { - states = serviceHub.vaultService - .queryBy() - .states - .map { it.state.data } - println("Found states $states") - } catch (e: Exception) { - println("Failed to retrieve states") - states = null - } - return states.toString().toByteArray() - } -} - /** * The resolveFlow function uses reflection to construct an instance of FlowLogic from the given * flow name and arguments. diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HelperTypes.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HelperTypes.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt index ffe4034420..966a31acf6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/HelperTypes.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import net.corda.core.serialization.CordaSerializable diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/MembershipFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/MembershipFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt index 742a709193..b57eca7bdf 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/MembershipFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import arrow.core.flatMap import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.MembershipStateContract -import com.weaver.corda.app.interop.states.Member -import com.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.Member +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState import net.corda.core.contracts.Command import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NetworkIdFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NetworkIdFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt index 7c47e8ad09..576670c365 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NetworkIdFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.NetworkIdStateContract -import com.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NodeSignatureFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NodeSignatureFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt index c4e8c81460..cb1fefd5a3 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/NodeSignatureFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt index a07df115ca..e4ca8ba6a8 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import co.paralleluniverse.fibers.Suspendable -import com.weaver.corda.app.interop.contracts.VerificationPolicyStateContract -import com.weaver.corda.app.interop.states.Identifier -import com.weaver.corda.app.interop.states.Policy -import com.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy +import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState import net.corda.core.contracts.Command import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/ViewVerification.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/ViewVerification.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt index 5c3e853721..18f34094ec 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/ViewVerification.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt @@ -4,17 +4,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.* import arrow.core.extensions.either.applicative.applicative import arrow.core.extensions.list.traverse.traverse import co.paralleluniverse.fibers.Suspendable import com.google.protobuf.ByteString -import com.weaver.protos.common.interop_payload.InteropPayloadOuterClass -import com.weaver.protos.common.state.State -import com.weaver.protos.corda.ViewDataOuterClass -import com.weaver.protos.fabric.view_data.ViewData +import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.protos.fabric.view_data.ViewData import net.corda.core.node.ServiceHub import org.hyperledger.fabric.protos.msp.Identities import org.hyperledger.fabric.protos.peer.ProposalPackage diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt index 9c25b55eb6..d148c847a0 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.corda.app.interop.flows import arrow.core.Either import arrow.core.Left @@ -23,12 +23,12 @@ import com.google.protobuf.ByteString import org.hyperledger.fabric.protos.msp.Identities import org.hyperledger.fabric.protos.peer.ProposalPackage -import com.weaver.protos.common.state.State -import com.weaver.protos.fabric.view_data.ViewData -import com.weaver.protos.corda.ViewDataOuterClass -import com.weaver.protos.common.interop_payload.InteropPayloadOuterClass -import com.weaver.corda.app.interop.contracts.ExternalStateContract -import com.weaver.corda.app.interop.states.ExternalState +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.fabric.view_data.ViewData +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract +import org.hyperledger.cacti.weaver.corda.app.interop.states.ExternalState /** diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt index 651de47e12..28a1653256 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class AssetClaimHTLCSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt index 2707f84484..8396b8d152 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class AssetClaimSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt index 1bbe3ec5b6..7f63516714 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_transfer.AssetTransfer +import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer import net.corda.core.serialization.SerializationCustomSerializer class AssetClaimStatusSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt index 1538c8447d..98d7e3cfaf 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class AssetExchangeAgreementSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt index afac5e0332..3cc16a467a 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class AssetLockHTLCSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt index 1fea32329e..15b0368aa6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class AssetLockSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt index 9520d710f0..82bb126cb3 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_transfer.AssetTransfer +import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer import net.corda.core.serialization.SerializationCustomSerializer class AssetPledgeSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt index 320e416a2a..8b223881a3 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import arrow.core.Either import net.corda.core.serialization.SerializationWhitelist diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt index a8b5d51375..2ae159d3c2 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.SerializationCustomSerializer class FungibleAssetExchangeAgreementSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt index 2d82f173a9..380a9453b2 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SerializationCustomSerializer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt index 3d661612e0..60b2edf965 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SerializationCustomSerializer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt index 150b97b1e3..dd32c1ab15 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers -import com.weaver.protos.common.state.State.Meta -import com.weaver.protos.common.state.State.Meta.Protocol +import org.hyperledger.cacti.weaver.protos.common.state.State.Meta +import org.hyperledger.cacti.weaver.protos.common.state.State.Meta.Protocol import net.corda.core.serialization.SerializationCustomSerializer /** diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt index b8dc7728c2..23df088899 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers -import com.weaver.protos.common.state.State.Meta.Protocol +import org.hyperledger.cacti.weaver.protos.common.state.State.Meta.Protocol import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SerializationCustomSerializer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt index 119f3e97a2..c5bfec1182 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers -import com.weaver.protos.common.query.QueryOuterClass.Query +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass.Query import net.corda.core.serialization.SerializationCustomSerializer /** diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt index 4a7fe924bd..4e04638ed4 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SerializationCustomSerializer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt index d52690c764..a2481cf6eb 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers import com.google.protobuf.ByteString -import com.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.common.state.State import net.corda.core.serialization.SerializationCustomSerializer class ViewSerializer: SerializationCustomSerializer { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist b/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist index 8313ba653e..3c98a2b1f0 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist @@ -1 +1 @@ -com.weaver.corda.app.interop.flows.customSerializers.CustomSerializationWhitelist +org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers.CustomSerializationWhitelist diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AccessControlPolicyTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AccessControlPolicyTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt index d29dba4755..eb2f8ef1c4 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AccessControlPolicyTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AccessControlPolicyState -import com.weaver.corda.app.interop.states.Rule -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -30,8 +30,8 @@ class AccessControlPolicyTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt similarity index 88% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt index 4c2fc0a878..b0ed81ad59 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt @@ -4,18 +4,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetLockHTLCData -import com.weaver.corda.app.interop.states.AssetClaimHTLCData -import com.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism -import com.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.corda.app.interop.test.* -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -47,9 +47,9 @@ class AssetExchangeHTLCSHA256Tests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -161,7 +161,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -197,7 +197,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, wrongClaimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -208,7 +208,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -219,7 +219,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -232,7 +232,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -311,7 +311,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt similarity index 88% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt index 950272bb8f..1e1cca4f3b 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt @@ -4,18 +4,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetLockHTLCData -import com.weaver.corda.app.interop.states.AssetClaimHTLCData -import com.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism -import com.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.corda.app.interop.test.* -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -47,9 +47,9 @@ class AssetExchangeHTLCSHA512Tests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -161,7 +161,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -197,7 +197,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -208,7 +208,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -219,7 +219,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -232,7 +232,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -247,7 +247,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo2, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -263,7 +263,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo3, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -342,7 +342,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "com.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", issuer )) network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt index 8b49da1279..e092189a18 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt @@ -4,19 +4,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.corda.app.interop.states.AssetLockHTLCData -import com.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData -import com.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.corda.app.interop.test.* -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -49,9 +49,9 @@ class AssetExchangeHTLCWrapperTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -114,8 +114,8 @@ class AssetExchangeHTLCWrapperTests { return tmp.getOrThrow() } - val getAssetFlow = "com.weaver.corda.app.interop.test.GetAssetRef" - val updateOwnerFlow = "com.weaver.corda.app.interop.test.UpdateOwnerFlow" + val getAssetFlow = "org.hyperledger.cacti.weaver.corda.app.interop.test.GetAssetRef" + val updateOwnerFlow = "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow" @Test diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CertUtilsTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CertUtilsTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt index dd2b215bb1..1e45cae46e 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CertUtilsTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.getCertificateFromString -import com.weaver.corda.app.interop.flows.verifyCertificateChain -import com.weaver.corda.app.interop.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.corda.app.interop.flows.getCertificateFromString +import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyCertificateChain +import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature import arrow.core.flatMap import arrow.core.Right -import com.weaver.corda.app.interop.flows.verifyCaCertificate +import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyCaCertificate import org.junit.Test import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CommonHelperFunctionTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt similarity index 99% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CommonHelperFunctionTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt index 739e093498..59cda9cf6a 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CommonHelperFunctionTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CreateExternalRequestTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt similarity index 85% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CreateExternalRequestTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt index 6a4791f621..fefc1077da 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/CreateExternalRequestTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.CreateAccessControlPolicy -import com.weaver.corda.app.interop.flows.CreateExternalRequest -import com.weaver.corda.app.interop.flows.CreateVerificationPolicyState -import com.weaver.corda.app.interop.flows.verifyNodeSignature -import com.weaver.corda.app.interop.states.Policy -import com.weaver.corda.app.interop.states.VerificationPolicyState -import com.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateAccessControlPolicy +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateExternalRequest +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateVerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy +import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -33,8 +33,8 @@ class CreateExternalRequestTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/HandleExternalRequestTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/HandleExternalRequestTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt index e8c7ca4a81..9740b028ab 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/HandleExternalRequestTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt @@ -4,19 +4,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Left import arrow.core.identity -import com.weaver.corda.app.interop.flows.CreateNodeSignatureFlow -import com.weaver.corda.app.interop.flows.CreateAccessControlPolicy -import com.weaver.corda.app.interop.flows.CreateMembershipState -import com.weaver.corda.app.interop.flows.HandleExternalRequest -import com.weaver.corda.app.interop.states.AccessControlPolicyState -import com.weaver.corda.app.interop.states.Member -import com.weaver.corda.app.interop.states.MembershipState -import com.weaver.corda.app.interop.states.Rule -import com.weaver.protos.common.query.QueryOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateNodeSignatureFlow +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateAccessControlPolicy +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateMembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.HandleExternalRequest +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Member +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -37,7 +37,8 @@ class HandleExternalRequestTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() @@ -92,7 +93,7 @@ class HandleExternalRequestTests { @Test fun `HandleExternalRequest happy case`() { - + // Create membership and access control in vault val future = partyA.startFlow(CreateAccessControlPolicy(accessControlPolicy)) network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/MembershipTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/MembershipTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt index 4a445f707f..08764838d6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/MembershipTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AccessControlPolicyState -import com.weaver.corda.app.interop.states.Member -import com.weaver.corda.app.interop.states.MembershipState -import com.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Member +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -34,8 +34,8 @@ class MembershipTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeDriver.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeDriver.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt index 6ef33bf5db..74c7954cf4 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeDriver.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import net.corda.core.identity.CordaX500Name import net.corda.core.utilities.getOrThrow diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeSignatureTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeSignatureTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt index 1c67f2ddca..afcd42733c 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/NodeSignatureTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature import org.junit.Test import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/VerificationPolicyTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/VerificationPolicyTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt index 1f8a2af573..5c8adb4909 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/VerificationPolicyTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop import arrow.core.Either -import com.weaver.corda.app.interop.flows.CreateVerificationPolicyState -import com.weaver.corda.app.interop.flows.DeleteVerificationPolicyState -import com.weaver.corda.app.interop.flows.UpdateVerificationPolicyState -import com.weaver.corda.app.interop.states.Policy -import com.weaver.corda.app.interop.states.VerificationPolicyState -import com.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateVerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.DeleteVerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.UpdateVerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy +import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -33,8 +33,8 @@ class VerificationPolicyTests { @BeforeClass @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt index 633e0b0efe..ca7af0b393 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.* +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.* import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -30,8 +30,8 @@ class WriteExternalStateTest { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest2.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest2.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt index 12df150c28..b92403a31b 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/com/weaver/corda/app/interop/WriteExternalStateTest2.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.corda.app.interop -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.* +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.* import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -30,8 +30,8 @@ class WriteExternalStateTest2 { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("com.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt index 05334de9af..92bef7c1a5 100644 --- a/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt +++ b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.app.interop.test +package org.hyperledger.cacti.weaver.corda.app.interop.test import co.paralleluniverse.fibers.Suspendable import net.corda.core.flows.* @@ -38,7 +38,7 @@ data class AssetState ( class AssetStateContract : Contract { companion object { - const val ID = "com.weaver.corda.app.interop.test.AssetStateContract" + const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.test.AssetStateContract" } override fun verify(tx: LedgerTransaction) { val command = tx.commands.requireSingleCommand() diff --git a/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestQueryFlow.kt b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestQueryFlow.kt new file mode 100644 index 0000000000..6648882ee4 --- /dev/null +++ b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestQueryFlow.kt @@ -0,0 +1,58 @@ +/* + * Copyright IBM Corp. All Rights Reserved. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.weaver.corda.app.interop.flows + +import co.paralleluniverse.fibers.Suspendable +import net.corda.core.flows.* +import net.corda.core.node.ServiceHub +import net.corda.core.node.services.queryBy +import net.corda.core.node.services.vault.QueryCriteria +import net.corda.core.identity.AbstractParty +import net.corda.core.identity.Party +import net.corda.core.contracts.StateAndRef +import net.corda.core.contracts.UniqueIdentifier +import net.corda.core.contracts.BelongsToContract +import net.corda.core.contracts.StaticPointer +import net.corda.core.contracts.LinearState +import net.corda.core.contracts.Command +import net.corda.core.contracts.CommandData +import net.corda.core.contracts.Contract +import net.corda.core.contracts.requireSingleCommand +import net.corda.core.contracts.requireThat +import net.corda.core.transactions.LedgerTransaction +import net.corda.core.transactions.TransactionBuilder + +/** + * The QueryState flow allows for finding the LinearState's for are data in the vault + * + * This flow is currently only being used for testing purposes. + */ +@StartableByRPC +class QueryState() : FlowLogic() { + + /** + * The call() method runs the flow logic. + * + * @return returns the LinearState's corresponding to the state in the vault + */ + @Suspendable + override fun call(): ByteArray { + println("Querying for states") + var states: List? + try { + states = serviceHub.vaultService + .queryBy() + .states + .map { it.state.data } + println("Found states $states") + } catch (e: Exception) { + println("Failed to retrieve states") + states = null + } + return states.toString().toByteArray() + } +} \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle index e8008815fa..3564c65e4c 100644 --- a/weaver/samples/corda/corda-simple-application/clients/build.gradle +++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle @@ -83,10 +83,10 @@ dependencies { implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0") implementation(group: 'com.fungiblehousetoken', name: 'workflows', version: "1.0") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt index be9681c55e..35b37e887b 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt @@ -21,8 +21,8 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import com.weaver.corda.sdk.AccessControlPolicyManager -import com.weaver.protos.common.access_control.AccessControl +import org.hyperledger.cacti.weaver.corda.sdk.AccessControlPolicyManager +import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl /** * TODO: Documentation diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt index 1921d9f58a..da302451a8 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt @@ -26,8 +26,8 @@ import net.corda.core.crypto.sha256 import java.time.Instant import net.corda.core.identity.CordaX500Name -import com.weaver.corda.sdk.AssetManager -import com.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.corda.sdk.AssetManager +import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions import com.cordaSimpleApplication.state.AssetState import com.cordaSimpleApplication.contract.AssetContract diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt index abac41be3f..15736f8af3 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt @@ -24,14 +24,14 @@ import kotlin.system.exitProcess import net.corda.core.messaging.startFlow import java.util.Base64 import net.corda.core.identity.CordaX500Name -import com.weaver.corda.sdk.AssetTransferSDK -import com.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.corda.sdk.AssetTransferSDK +import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper import com.cordaSimpleApplication.contract.AssetContract import com.cordaSimpleApplication.contract.BondAssetContract import java.util.Calendar -import com.weaver.corda.app.interop.flows.RetrieveNetworkId -import com.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import com.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkId +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState import com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId import com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId import com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt index 2fc3b3a7bc..d9c1c50d6d 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt @@ -20,7 +20,7 @@ import java.nio.file.Paths import java.util.stream.Collectors import net.corda.core.identity.Party -import com.weaver.corda.sdk.CredentialsCreator +import org.hyperledger.cacti.weaver.corda.sdk.CredentialsCreator class ConfigureCommand : CliktCommand(help ="Configure Command") { override fun run() { diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt index 4cf1fbfd47..123fba30d9 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt @@ -25,8 +25,8 @@ import net.corda.core.utilities.OpaqueBytes import net.corda.core.crypto.sha256 import java.time.Instant -import com.weaver.corda.sdk.AssetManager -import com.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.corda.sdk.AssetManager +import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions import com.cordaSimpleApplication.state.AssetState import com.cordaSimpleApplication.contract.AssetContract diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt index ca2df36b67..577c483517 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt @@ -24,10 +24,10 @@ import net.corda.core.messaging.startFlow import org.json.JSONObject import java.util.Base64 import java.util.Calendar -import com.weaver.corda.app.interop.states.AssetClaimStatusState -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import com.weaver.corda.sdk.AssetTransferSDK +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.corda.sdk.AssetTransferSDK import com.cordaSimpleApplication.contract.AssetContract import net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId @@ -41,7 +41,7 @@ import com.google.gson.GsonBuilder import com.r3.corda.lib.tokens.contracts.commands.RedeemTokenCommand import com.r3.corda.lib.tokens.contracts.commands.IssueTokenCommand import com.r3.corda.lib.tokens.contracts.FungibleTokenContract -import com.weaver.corda.app.interop.flows.RetrieveNetworkId +import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkId import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt index 5f1dd4ccb9..649e554bf7 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt @@ -21,7 +21,7 @@ import java.util.* import com.cordaSimpleApplication.flow.CreateState import com.cordaSimpleApplication.state.SimpleState -import com.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper /** * The CLI command used to trigger a request for state from an external network. diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt index 952e372ca2..3c1af69ccb 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt @@ -21,8 +21,8 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import com.weaver.corda.sdk.MembershipManager -import com.weaver.protos.common.membership.MembershipOuterClass +import org.hyperledger.cacti.weaver.corda.sdk.MembershipManager +import org.hyperledger.cacti.weaver.protos.common.membership.MembershipOuterClass /** * TODO: Documentation diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt index d994ab7adb..57315758a6 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt @@ -6,8 +6,8 @@ package com.cordaSimpleApplication.client -import com.weaver.corda.app.interop.flows.CreateNetworkIdState -import com.weaver.corda.app.interop.flows.RetrieveNetworkIdStateAndRef +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateNetworkIdState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkIdStateAndRef import com.cordaSimpleApplication.flow.TransferAssetStateInitiator import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.requireObject @@ -17,7 +17,7 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.default import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import com.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState import java.lang.Exception import net.corda.core.messaging.startFlow diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt index 7d47dd8df5..a5bf684e5f 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt @@ -22,8 +22,8 @@ import kotlin.system.exitProcess import java.util.Base64 import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import com.weaver.corda.app.interop.flows.x509CertToPem -import com.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.corda.app.interop.flows.x509CertToPem +import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions class UtilsCommand : CliktCommand(name = "utils", help ="Manages utilities") { override fun run() { diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt index 5448b72a34..8c3bb5dd9b 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt @@ -21,8 +21,8 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import com.weaver.corda.sdk.VerificationPolicyManager -import com.weaver.protos.common.verification_policy.VerificationPolicyOuterClass +import org.hyperledger.cacti.weaver.corda.sdk.VerificationPolicyManager +import org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass /** * TODO: Documentation diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle index 9cb65d50eb..aecbb70ded 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle @@ -41,8 +41,8 @@ configurations { dependencies { compile 'com.google.code.gson:gson:2.8.6' - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt index 64e536854c..1454e24c83 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt @@ -31,10 +31,10 @@ import sun.security.x509.UniqueIdentity import java.util.* import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import com.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes /** diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt index 297e9a22e4..655541ee6a 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt @@ -31,10 +31,10 @@ import sun.security.x509.UniqueIdentity import java.util.* import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import com.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes /** diff --git a/weaver/samples/corda/fungible-house-token/build.gradle b/weaver/samples/corda/fungible-house-token/build.gradle index 1d9364a9ae..dd57ea050d 100644 --- a/weaver/samples/corda/fungible-house-token/build.gradle +++ b/weaver/samples/corda/fungible-house-token/build.gradle @@ -83,8 +83,8 @@ allprojects { dependencies { compile 'com.google.code.gson:gson:2.8.6' - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { diff --git a/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt b/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt index 5013133301..3d0c956bd5 100644 --- a/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt +++ b/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt @@ -1,9 +1,9 @@ package net.corda.samples.tokenizedhouse.flows -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import com.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import com.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes import net.corda.samples.tokenizedhouse.states.FungibleHouseTokenJson import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/weaver/sdks/corda/README.md b/weaver/sdks/corda/README.md index 06449fbe09..4238b79e66 100644 --- a/weaver/sdks/corda/README.md +++ b/weaver/sdks/corda/README.md @@ -64,10 +64,10 @@ repositories { } } dependencies { - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.2.3") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.3") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.3") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "1.2.3") } ``` diff --git a/weaver/sdks/corda/build.gradle b/weaver/sdks/corda/build.gradle index 1919080d99..9d697a9e44 100644 --- a/weaver/sdks/corda/build.gradle +++ b/weaver/sdks/corda/build.gradle @@ -68,9 +68,9 @@ dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_version" - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/weaver/sdks/corda/gradle.properties b/weaver/sdks/corda/gradle.properties index d1c64e427c..c31b06ea0c 100644 --- a/weaver/sdks/corda/gradle.properties +++ b/weaver/sdks/corda/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official name=weaver-corda-sdk -group=com.weaver.corda.sdk +group=org.hyperledger.cacti.weaver.corda.sdk version=1.2.14 kotlin.incremental=false diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AccessControlPolicyManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt similarity index 95% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AccessControlPolicyManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt index 692f49c7ad..589120898d 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AccessControlPolicyManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -19,10 +19,10 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import com.weaver.corda.app.interop.states.AccessControlPolicyState -import com.weaver.corda.app.interop.states.Rule -import com.weaver.corda.app.interop.flows.* -import com.weaver.protos.common.access_control.AccessControl +import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl class AccessControlPolicyManager { diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt similarity index 97% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt index 665cda24a5..591aeb49e7 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -20,10 +20,10 @@ import net.corda.core.identity.Party import java.lang.Exception import java.util.* import com.google.protobuf.ByteString -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import com.weaver.protos.common.asset_locks.AssetLocks +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks class AssetManager { companion object { diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetTransferSDK.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetTransferSDK.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt index a2424b303e..4840e870c3 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/AssetTransferSDK.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -20,13 +20,13 @@ import net.corda.core.identity.Party import java.lang.Exception import java.util.* import com.google.protobuf.ByteString -import com.weaver.corda.app.interop.flows.* -import com.weaver.corda.app.interop.states.AssetPledgeState -import com.weaver.corda.app.interop.states.AssetPledgeParameters -import com.weaver.corda.app.interop.states.AssetClaimParameters -import com.weaver.corda.app.interop.states.AssetReclaimParameters +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeParameters +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimParameters +import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetReclaimParameters -import com.weaver.protos.common.asset_transfer.AssetTransfer +import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer class AssetTransferSDK { companion object { diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsCreator.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt similarity index 93% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsCreator.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt index e5ba88fa1a..92819d7784 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsCreator.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt @@ -7,16 +7,16 @@ * Helper function used by ConfigureCreateAllCommand */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import net.corda.core.contracts.UniqueIdentifier import org.json.JSONObject import java.util.* import org.slf4j.LoggerFactory -import com.weaver.protos.common.access_control.AccessControl -import com.weaver.protos.common.membership.MembershipOuterClass -import com.weaver.protos.common.verification_policy.VerificationPolicyOuterClass +import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl +import org.hyperledger.cacti.weaver.protos.common.membership.MembershipOuterClass +import org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass /** diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsExtractor.java b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java similarity index 99% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsExtractor.java rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java index e7d2eb9e1d..da11df388b 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/CredentialsExtractor.java +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import java.io.BufferedReader; import java.io.File; diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/HashFunctions.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt similarity index 93% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/HashFunctions.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt index 2b378c4a55..df303cbb6d 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/HashFunctions.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import java.util.Base64 import net.corda.core.utilities.OpaqueBytes import net.corda.core.crypto.sha256 import kotlin.random.Random -import com.weaver.protos.common.asset_locks.AssetLocks.HashMechanism -import com.weaver.corda.app.interop.states.sha512 +import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks.HashMechanism +import org.hyperledger.cacti.weaver.corda.app.interop.states.sha512 class HashFunctions { /* diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/InteroperableHelper.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/InteroperableHelper.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt index ca5d1d57c2..d5a5eaf10d 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/InteroperableHelper.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -28,13 +28,13 @@ import org.slf4j.LoggerFactory import net.corda.core.messaging.startFlow import net.corda.core.messaging.CordaRPCOps -import com.weaver.corda.app.interop.flows.CreateExternalRequest -import com.weaver.corda.app.interop.flows.WriteExternalStateInitiator -import com.weaver.corda.app.interop.flows.GetExternalStateByLinearId -import com.weaver.protos.common.interop_payload.InteropPayloadOuterClass -import com.weaver.protos.common.state.State -import com.weaver.protos.corda.ViewDataOuterClass -import com.weaver.protos.networks.networks.Networks +import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateExternalRequest +import org.hyperledger.cacti.weaver.corda.app.interop.flows.WriteExternalStateInitiator +import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetExternalStateByLinearId +import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass +import org.hyperledger.cacti.weaver.protos.common.state.State +import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass +import org.hyperledger.cacti.weaver.protos.networks.networks.Networks class InteroperableHelper { companion object { diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/MembershipManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt similarity index 95% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/MembershipManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt index d0c64437e4..3981fbfc52 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/MembershipManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -19,10 +19,10 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import com.weaver.corda.app.interop.states.MembershipState -import com.weaver.corda.app.interop.states.Member -import com.weaver.corda.app.interop.flows.* -import com.weaver.protos.common.membership.MembershipOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Member +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.protos.common.membership.MembershipOuterClass class MembershipManager { diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/RelayClient.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt similarity index 93% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/RelayClient.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt index be24b4763c..7ed45e0642 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/RelayClient.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import io.grpc.ManagedChannel import io.grpc.Status @@ -15,8 +15,8 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.slf4j.LoggerFactory -import com.weaver.protos.networks.networks.NetworkGrpcKt.NetworkCoroutineStub -import com.weaver.protos.networks.networks.Networks +import org.hyperledger.cacti.weaver.protos.networks.networks.NetworkGrpcKt.NetworkCoroutineStub +import org.hyperledger.cacti.weaver.protos.networks.networks.Networks /** * RelayClient implements a gRPC client that connects to a local relay to request external state. diff --git a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/VerificationPolicyManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt similarity index 95% rename from weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/VerificationPolicyManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt index 0a6afb9744..f97a7b3574 100644 --- a/weaver/sdks/corda/src/main/kotlin/com/weaver/corda/sdk/VerificationPolicyManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.corda.sdk; import arrow.core.Either import arrow.core.Left @@ -19,11 +19,11 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import com.weaver.corda.app.interop.states.VerificationPolicyState -import com.weaver.corda.app.interop.states.Identifier -import com.weaver.corda.app.interop.states.Policy -import com.weaver.corda.app.interop.flows.* -import com.weaver.protos.common.verification_policy.VerificationPolicyOuterClass +import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy +import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass class VerificationPolicyManager { diff --git a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh index fa8b78fafd..ba1810e6a1 100755 --- a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh +++ b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh @@ -99,7 +99,7 @@ else username=`sed '/^\#/d' $file | grep 'username=' | cut -d "=" -f2-` password=`sed '/^\#/d' $file | grep 'password=' | cut -d "=" -f2-` pkgurl=`sed '/^\#/d' $file | grep 'url=' | cut -d "=" -f2-` - baseUrl="$pkgurl/com/weaver" + baseUrl="$pkgurl/org/hyperledger/cacti/weaver" echo "Downloading Corda Interop App from $baseUrl ..." (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-contracts/$weaverCordaVersion/interop-contracts-$weaverCordaVersion.jar) || exit 1 (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-workflows/$weaverCordaVersion/interop-workflows-$weaverCordaVersion.jar) || exit 1