From 16bab364faa02d29121f95ad72fa7b0946eba95a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 22 Oct 2019 19:44:54 +0200 Subject: [PATCH 1/3] expose offchain worker storage prefix --- core/offchain/src/api.rs | 2 +- core/offchain/src/lib.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/offchain/src/api.rs b/core/offchain/src/api.rs index 35b6e20df2b29..d1f2072ade2be 100644 --- a/core/offchain/src/api.rs +++ b/core/offchain/src/api.rs @@ -71,7 +71,7 @@ fn unavailable_yet(name: &str) -> R { } const LOCAL_DB: &str = "LOCAL (fork-aware) DB"; -const STORAGE_PREFIX: &[u8] = b"storage"; +pub const STORAGE_PREFIX: &[u8] = b"storage"; impl OffchainExt for Api where diff --git a/core/offchain/src/lib.rs b/core/offchain/src/lib.rs index a335ca53807ab..248a47ef25029 100644 --- a/core/offchain/src/lib.rs +++ b/core/offchain/src/lib.rs @@ -54,6 +54,7 @@ mod api; pub mod testing; pub use offchain_primitives::OffchainWorkerApi; +pub use api::STORAGE_PREFIX; /// An offchain workers manager. pub struct OffchainWorkers { From 10d72939d51cd06c3cf72354ec1c8828d57dd900 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 23 Oct 2019 11:25:45 +0200 Subject: [PATCH 2/3] add docs --- core/offchain/src/api.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/core/offchain/src/api.rs b/core/offchain/src/api.rs index d1f2072ade2be..0b48c41f3e0dd 100644 --- a/core/offchain/src/api.rs +++ b/core/offchain/src/api.rs @@ -71,6 +71,7 @@ fn unavailable_yet(name: &str) -> R { } const LOCAL_DB: &str = "LOCAL (fork-aware) DB"; +/// Local Storage Prefix used by the Offchain Worker API to pub const STORAGE_PREFIX: &[u8] = b"storage"; impl OffchainExt for Api From 11b6e6789bee8984ca4ca8ab556019a981c453c1 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Thu, 31 Oct 2019 12:47:16 +0100 Subject: [PATCH 3/3] move STORAGE_PREFIX to primitives --- core/offchain/primitives/src/lib.rs | 3 +++ core/offchain/src/api.rs | 3 +-- core/offchain/src/lib.rs | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/offchain/primitives/src/lib.rs b/core/offchain/primitives/src/lib.rs index dda08ae43f570..79fed8cb34150 100644 --- a/core/offchain/primitives/src/lib.rs +++ b/core/offchain/primitives/src/lib.rs @@ -22,6 +22,9 @@ use client::decl_runtime_apis; use sr_primitives::traits::NumberFor; +/// Local Storage Prefix used by the Offchain Worker API to +pub const STORAGE_PREFIX: &[u8] = b"storage"; + decl_runtime_apis! { /// The offchain worker api. pub trait OffchainWorkerApi { diff --git a/core/offchain/src/api.rs b/core/offchain/src/api.rs index 0b48c41f3e0dd..b4d55e5f06823 100644 --- a/core/offchain/src/api.rs +++ b/core/offchain/src/api.rs @@ -30,6 +30,7 @@ use primitives::offchain::{ Externalities as OffchainExt, HttpRequestId, Timestamp, HttpRequestStatus, HttpError, OpaqueNetworkState, OpaquePeerId, OpaqueMultiaddr, StorageKind, }; +pub use offchain_primitives::STORAGE_PREFIX; use sr_primitives::{generic::BlockId, traits::{self, Extrinsic}}; use transaction_pool::txpool::{Pool, ChainApi}; @@ -71,8 +72,6 @@ fn unavailable_yet(name: &str) -> R { } const LOCAL_DB: &str = "LOCAL (fork-aware) DB"; -/// Local Storage Prefix used by the Offchain Worker API to -pub const STORAGE_PREFIX: &[u8] = b"storage"; impl OffchainExt for Api where diff --git a/core/offchain/src/lib.rs b/core/offchain/src/lib.rs index 248a47ef25029..69147295896ba 100644 --- a/core/offchain/src/lib.rs +++ b/core/offchain/src/lib.rs @@ -53,8 +53,7 @@ mod api; pub mod testing; -pub use offchain_primitives::OffchainWorkerApi; -pub use api::STORAGE_PREFIX; +pub use offchain_primitives::{OffchainWorkerApi, STORAGE_PREFIX}; /// An offchain workers manager. pub struct OffchainWorkers {