From 2c5fb001806bdbd69b36e94e78be33b4c933d23a Mon Sep 17 00:00:00 2001 From: Ladd Hoffman Date: Sun, 28 Apr 2024 18:11:20 -0500 Subject: [PATCH] rename WorkContract to Work --- ethereum/contracts/Onboarding.sol | 6 +++--- .../{RollableWorkContract.sol => RollableWork.sol} | 6 +++--- ethereum/contracts/{WorkContract.sol => Work.sol} | 2 +- ethereum/contracts/Work1.sol | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename ethereum/contracts/{RollableWorkContract.sol => RollableWork.sol} (91%) rename ethereum/contracts/{WorkContract.sol => Work.sol} (98%) diff --git a/ethereum/contracts/Onboarding.sol b/ethereum/contracts/Onboarding.sol index 5fe2e21..b640960 100644 --- a/ethereum/contracts/Onboarding.sol +++ b/ethereum/contracts/Onboarding.sol @@ -3,15 +3,15 @@ pragma solidity ^0.8.24; import "./core/DAO.sol"; import "./core/Forum.sol"; -import "./WorkContract.sol"; +import "./Work.sol"; import "./interfaces/IOnValidate.sol"; -contract Onboarding is WorkContract, IOnValidate { +contract Onboarding is Work, IOnValidate { constructor( DAO dao_, Proposals proposals_, uint price_ - ) WorkContract(dao_, proposals_, price_) {} + ) Work(dao_, proposals_, price_) {} /// Accept work approval/disapproval from customer function submitWorkApproval( diff --git a/ethereum/contracts/RollableWorkContract.sol b/ethereum/contracts/RollableWork.sol similarity index 91% rename from ethereum/contracts/RollableWorkContract.sol rename to ethereum/contracts/RollableWork.sol index da797e4..969dead 100644 --- a/ethereum/contracts/RollableWorkContract.sol +++ b/ethereum/contracts/RollableWork.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Unlicense pragma solidity ^0.8.24; -import "./WorkContract.sol"; +import "./Work.sol"; import "./Rollup.sol"; -abstract contract RollableWorkContract is WorkContract { +abstract contract RollableWork is Work { Rollup immutable rollupContract; constructor( @@ -12,7 +12,7 @@ abstract contract RollableWorkContract is WorkContract { Proposals proposalsContract, uint price, Rollup rollupContract_ - ) WorkContract(dao, proposalsContract, price) { + ) Work(dao, proposalsContract, price) { rollupContract = rollupContract_; } diff --git a/ethereum/contracts/WorkContract.sol b/ethereum/contracts/Work.sol similarity index 98% rename from ethereum/contracts/WorkContract.sol rename to ethereum/contracts/Work.sol index 38f68f5..a42f684 100644 --- a/ethereum/contracts/WorkContract.sol +++ b/ethereum/contracts/Work.sol @@ -7,7 +7,7 @@ import "./Availability.sol"; import "./Proposals.sol"; import "./interfaces/IOnProposalAccepted.sol"; -abstract contract WorkContract is Availability, IOnProposalAccepted { +abstract contract Work is Availability, IOnProposalAccepted { enum WorkStatus { Requested, EvidenceSubmitted, diff --git a/ethereum/contracts/Work1.sol b/ethereum/contracts/Work1.sol index 75d9a87..1b9749e 100644 --- a/ethereum/contracts/Work1.sol +++ b/ethereum/contracts/Work1.sol @@ -2,13 +2,13 @@ pragma solidity ^0.8.24; import "./core/DAO.sol"; -import "./WorkContract.sol"; +import "./Work.sol"; import "./Proposals.sol"; -contract Work1 is WorkContract { +contract Work1 is Work { constructor( DAO dao_, Proposals proposals_, uint price_ - ) WorkContract(dao_, proposals_, price_) {} + ) Work(dao_, proposals_, price_) {} }