diff --git a/.circleci/config.yml b/.circleci/config.yml index 76f49bff..6ead33fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,18 +58,9 @@ jobs: executor: golang steps: - install-deps - - prepare - - run: - name: Install Headless Chrome Dependencies - command: | - sudo apt-get install -yq \ - gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \ - libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \ - libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \ - libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \ - fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget + - prepare - node/install-packages - - run: make diagrams + - run: make docsgen - run: git --no-pager diff - run: git --no-pager diff --quiet diff --git a/docs/storageclient.mmd b/docs/storageclient.mmd index d2796c28..0e91ad36 100644 --- a/docs/storageclient.mmd +++ b/docs/storageclient.mmd @@ -58,14 +58,14 @@ stateDiagram-v2 7 --> 26 : ClientEventDealCompletionFailed 11 --> 26 : ClientEventFailed - note left of 21 : The following events only record in this state.

ClientEventFundsReserved - - note left of 3 : The following events only record in this state.

ClientEventFundsReleased note left of 11 : The following events only record in this state.

ClientEventFundsReleased + + note left of 21 : The following events only record in this state.

ClientEventFundsReserved + 9 --> [*] 8 --> [*] 26 --> [*] diff --git a/docs/storageclient.mmd.svg b/docs/storageclient.mmd.svg index 7d30764e..40500064 100644 --- a/docs/storageclient.mmd.svg +++ b/docs/storageclient.mmd.svg @@ -1,6 +1,6 @@ -ClientEventOpenClientEventFundingInitiatedClientEventEnsureFundsFailedClientEventEnsureFundsFailedClientEventFundsEnsuredClientEventFundsEnsuredClientEventWriteProposalFailedClientEventReadResponseFailedClientEventResponseVerificationFailedClientEventInitiateDataTransferClientEventUnexpectedDealStateClientEventDataTransferFailedClientEventDataTransferFailedClientEventDataTransferInitiatedClientEventDataTransferCompleteClientEventDataTransferCompleteClientEventWaitForDealStateClientEventResponseDealDidNotMatchClientEventDealRejectedClientEventDealAcceptedClientEventDealPublishFailedClientEventDealPublishedClientEventDealActivationFailedClientEventDealActivatedClientEventDealSlashedClientEventDealExpiredClientEventDealCompletionFailedClientEventFailedStorageDealUnknownStorageDealProposalAcceptedOn entry runs ValidateDealPublishedStorageDealSealingOn entry runs VerifyDealActivatedStorageDealActiveOn entry runs WaitForDealCompletionStorageDealExpiredStorageDealSlashedStorageDealFailingOn entry runs FailDealStorageDealFundsEnsuredOn entry runs ProposeDealStorageDealCheckForAcceptanceOn entry runs CheckForDealAcceptanceStorageDealStartDataTransferOn entry runs InitiateDataTransferStorageDealTransferringStorageDealEnsureClientFundsOn entry runs EnsureClientFundsStorageDealClientFundingOn entry runs WaitForFundingStorageDealErrorThe following events are not shown cause they can trigger from any state.ClientEventStreamCloseError - transitions state to StorageDealErrorClientEventRestart - does not transition stateThe following events only record in this state.ClientEventFundsReleasedThe following events only record in this state.ClientEventFundsReleasedThe following events only record in this state.ClientEventFundsReserved \ No newline at end of file diff --git a/docs/storageprovider.mmd b/docs/storageprovider.mmd index 7000b87e..30f1add1 100644 --- a/docs/storageprovider.mmd +++ b/docs/storageprovider.mmd @@ -80,10 +80,10 @@ stateDiagram-v2 note left of 4 : The following events only record in this state.

ProviderEventPieceStoreErrored - note left of 20 : The following events only record in this state.

ProviderEventFundsReserved + note left of 11 : The following events only record in this state.

ProviderEventFundsReleased - note left of 11 : The following events only record in this state.

ProviderEventFundsReleased + note left of 20 : The following events only record in this state.

ProviderEventFundsReserved note left of 25 : The following events only record in this state.

ProviderEventFundsReleased diff --git a/docs/storageprovider.mmd.svg b/docs/storageprovider.mmd.svg index 06a316e6..e4af9616 100644 --- a/docs/storageprovider.mmd.svg +++ b/docs/storageprovider.mmd.svg @@ -1,6 +1,6 @@ -ProviderEventOpenProviderEventDealRejectedProviderEventDealRejectedProviderEventDealRejectedProviderEventRejectionSentProviderEventDealDecidingProviderEventDataRequestedProviderEventDataTransferFailedProviderEventDataTransferInitiatedProviderEventDataTransferCompletedProviderEventDataVerificationFailedProviderEventVerifiedDataProviderEventVerifiedDataProviderEventFundingInitiatedProviderEventFundedProviderEventFundedProviderEventDealPublishInitiatedProviderEventDealPublishErrorProviderEventSendResponseFailedProviderEventSendResponseFailedProviderEventDealPublishedProviderEventFileStoreErroredProviderEventFileStoreErroredProviderEventFileStoreErroredProviderEventMultistoreErroredProviderEventDealHandoffFailedProviderEventDealHandedOffProviderEventDealActivationFailedProviderEventDealActivatedProviderEventCleanupFinishedProviderEventDealSlashedProviderEventDealExpiredProviderEventDealCompletionFailedProviderEventFailedProviderEventRestartProviderEventRestartProviderEventRestartProviderEventTrackFundsFailedStorageDealUnknownStorageDealStagedOn entry runs HandoffDealStorageDealSealingOn entry runs VerifyDealActivatedStorageDealFinalizingOn entry runs CleanupDealStorageDealActiveOn entry runs WaitForDealCompletionStorageDealExpiredStorageDealSlashedStorageDealRejectingOn entry runs RejectDealStorageDealFailingOn entry runs FailDealStorageDealValidatingOn entry runs ValidateDealProposalStorageDealAcceptWaitOn entry runs DecideOnProposalStorageDealTransferringStorageDealWaitingForDataStorageDealVerifyDataOn entry runs VerifyDataStorageDealEnsureProviderFundsOn entry runs EnsureProviderFundsStorageDealProviderFundingOn entry runs WaitForFundingStorageDealPublishOn entry runs PublishDealStorageDealPublishingOn entry runs WaitForPublishStorageDealErrorThe following events are not shown cause they can trigger from any state.ProviderEventNodeErrored - transitions state to StorageDealFailingProviderEventRestart - does not transition stateThe following events only record in this state.ProviderEventPieceStoreErroredThe following events only record in this state.ProviderEventFundsReleasedThe following events only record in this state.ProviderEventFundsReservedThe following events only record in this state.ProviderEventFundsReleased \ No newline at end of file diff --git a/go.mod b/go.mod index 95a2927d..8eaeae36 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/filecoin-project/go-data-transfer v0.6.1 github.com/filecoin-project/go-multistore v0.0.3 github.com/filecoin-project/go-padreader v0.0.0-20200210211231-548257017ca6 - github.com/filecoin-project/go-statemachine v0.0.0-20200730031800-c3336614d2a7 + github.com/filecoin-project/go-statemachine v0.0.0-20200813232949-df9b130df370 github.com/filecoin-project/go-statestore v0.1.0 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b github.com/filecoin-project/sector-storage v0.0.0-20200730050024-3ee28c3b6d9a diff --git a/go.sum b/go.sum index db753067..2bc737fc 100644 --- a/go.sum +++ b/go.sum @@ -104,8 +104,8 @@ github.com/filecoin-project/go-padreader v0.0.0-20200210211231-548257017ca6/go.m github.com/filecoin-project/go-paramfetch v0.0.2-0.20200218225740-47c639bab663 h1:eYxi6vI5CyeXD15X1bB3bledDXbqKxqf0wQzTLgwYwA= github.com/filecoin-project/go-paramfetch v0.0.2-0.20200218225740-47c639bab663/go.mod h1:fZzmf4tftbwf9S37XRifoJlz7nCjRdIrMGLR07dKLCc= github.com/filecoin-project/go-statemachine v0.0.0-20200714194326-a77c3ae20989/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= -github.com/filecoin-project/go-statemachine v0.0.0-20200730031800-c3336614d2a7 h1:KAF3WM/xSnl6G6RHX8vDJthg4+e4PSgBh72//6c6Qvc= -github.com/filecoin-project/go-statemachine v0.0.0-20200730031800-c3336614d2a7/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= +github.com/filecoin-project/go-statemachine v0.0.0-20200813232949-df9b130df370 h1:Jbburj7Ih2iaJ/o5Q9A+EAeTabME6YII7FLi9SKUf5c= +github.com/filecoin-project/go-statemachine v0.0.0-20200813232949-df9b130df370/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statestore v0.1.0 h1:t56reH59843TwXHkMcwyuayStBIiWBRilQjQ+5IiwdQ= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b h1:fkRZSPrYpk42PV3/lIXiL0LHetxde7vyYYvSsttQtfg=