From 700afbccb7f904fe3e220b7ffbbaf5d13002044b Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 29 Nov 2019 10:21:05 +0800
Subject: [PATCH] rename Key and Value because sdk requires unique name (#51)
---
oracle/src/default_combine_data.rs | 4 ++--
oracle/src/lib.rs | 36 +++++++++++++++---------------
oracle/src/mock.rs | 4 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/oracle/src/default_combine_data.rs b/oracle/src/default_combine_data.rs
index 7b7f65e..aabaa52 100644
--- a/oracle/src/default_combine_data.rs
+++ b/oracle/src/default_combine_data.rs
@@ -11,9 +11,9 @@ use crate::{MomentOf, TimestampedValueOf, Trait};
/// Returns prev_value if not enough valid values.
pub struct DefaultCombineData<T: Trait>(rstd::marker::PhantomData<T>);
-impl<T: Trait> CombineData<T::Key, TimestampedValueOf<T>> for DefaultCombineData<T> {
+impl<T: Trait> CombineData<T::OracleKey, TimestampedValueOf<T>> for DefaultCombineData<T> {
fn combine_data(
- _key: &T::Key,
+ _key: &T::OracleKey,
values: Vec<TimestampedValueOf<T>>,
prev_value: Option<TimestampedValueOf<T>>,
) -> Option<TimestampedValueOf<T>> {
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
index 15c6eb2..a2258e4 100644
--- a/oracle/src/lib.rs
+++ b/oracle/src/lib.rs
@@ -21,23 +21,23 @@ pub use orml_traits::{CombineData, DataProvider, OnNewData};
pub use timestamped_value::TimestampedValue;
type MomentOf<T> = <<T as Trait>::Time as Time>::Moment;
-pub type TimestampedValueOf<T> = TimestampedValue<<T as Trait>::Value, MomentOf<T>>;
+pub type TimestampedValueOf<T> = TimestampedValue<<T as Trait>::OracleValue, MomentOf<T>>;
pub trait Trait: frame_system::Trait {
type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
- type OnNewData: OnNewData<Self::Key, Self::Value>;
+ type OnNewData: OnNewData<Self::OracleKey, Self::OracleValue>;
type OperatorProvider: OperatorProvider<Self::AccountId>;
- type CombineData: CombineData<Self::Key, TimestampedValueOf<Self>>;
+ type CombineData: CombineData<Self::OracleKey, TimestampedValueOf<Self>>;
type Time: Time;
- type Key: Parameter + Member;
- type Value: Parameter + Member + Ord;
+ type OracleKey: Parameter + Member;
+ type OracleValue: Parameter + Member + Ord;
}
decl_storage! {
trait Store for Module<T: Trait> as Oracle {
- pub RawValues get(raw_values): double_map T::Key, blake2_256(T::AccountId) => Option<TimestampedValueOf<T>>;
- pub HasUpdate get(has_update): map T::Key => bool;
- pub Values get(values): map T::Key => Option<TimestampedValueOf<T>>;
+ pub RawValues get(raw_values): double_map T::OracleKey, blake2_256(T::AccountId) => Option<TimestampedValueOf<T>>;
+ pub HasUpdate get(has_update): map T::OracleKey => bool;
+ pub Values get(values): map T::OracleKey => Option<TimestampedValueOf<T>>;
}
}
@@ -52,12 +52,12 @@ decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {
fn deposit_event() = default;
- pub fn feed_value(origin, key: T::Key, value: T::Value) -> Result {
+ pub fn feed_value(origin, key: T::OracleKey, value: T::OracleValue) -> Result {
let who = ensure_signed(origin)?;
Self::_feed_values(who, vec![(key, value)]).map_err(|e| e.into())
}
- pub fn feed_values(origin, values: Vec<(T::Key, T::Value)>) -> Result {
+ pub fn feed_values(origin, values: Vec<(T::OracleKey, T::OracleValue)>) -> Result {
let who = ensure_signed(origin)?;
Self::_feed_values(who, values).map_err(|e| e.into())
}
@@ -67,23 +67,23 @@ decl_module! {
decl_event!(
pub enum Event<T> where
<T as frame_system::Trait>::AccountId,
- <T as Trait>::Key,
- <T as Trait>::Value,
+ <T as Trait>::OracleKey,
+ <T as Trait>::OracleValue,
{
/// New feed data is submitted (sender, values)
- NewFeedData(AccountId, Vec<(Key, Value)>),
+ NewFeedData(AccountId, Vec<(OracleKey, OracleValue)>),
}
);
impl<T: Trait> Module<T> {
- pub fn read_raw_values(key: &T::Key) -> Vec<TimestampedValueOf<T>> {
+ pub fn read_raw_values(key: &T::OracleKey) -> Vec<TimestampedValueOf<T>> {
T::OperatorProvider::operators()
.iter()
.filter_map(|x| <RawValues<T>>::get(key, x))
.collect()
}
- pub fn get(key: &T::Key) -> Option<TimestampedValueOf<T>> {
+ pub fn get(key: &T::OracleKey) -> Option<TimestampedValueOf<T>> {
if <HasUpdate<T>>::take(key) {
let values = Self::read_raw_values(key);
let timestamped = T::CombineData::combine_data(key, values, <Values<T>>::get(key))?;
@@ -94,14 +94,14 @@ impl<T: Trait> Module<T> {
}
}
-impl<T: Trait> DataProvider<T::Key, T::Value> for Module<T> {
- fn get(key: &T::Key) -> Option<T::Value> {
+impl<T: Trait> DataProvider<T::OracleKey, T::OracleValue> for Module<T> {
+ fn get(key: &T::OracleKey) -> Option<T::OracleValue> {
Self::get(key).map(|timestamped_value| timestamped_value.value)
}
}
impl<T: Trait> Module<T> {
- fn _feed_values(who: T::AccountId, values: Vec<(T::Key, T::Value)>) -> result::Result<(), Error> {
+ fn _feed_values(who: T::AccountId, values: Vec<(T::OracleKey, T::OracleValue)>) -> result::Result<(), Error> {
ensure!(T::OperatorProvider::can_feed_data(&who), Error::NoPermission);
let now = T::Time::now();
diff --git a/oracle/src/mock.rs b/oracle/src/mock.rs
index 0af5cef..e7da759 100644
--- a/oracle/src/mock.rs
+++ b/oracle/src/mock.rs
@@ -77,8 +77,8 @@ impl Trait for Test {
type OperatorProvider = MockOperatorProvider;
type CombineData = DefaultCombineData<Self>;
type Time = pallet_timestamp::Module<Self>;
- type Key = Key;
- type Value = Value;
+ type OracleKey = Key;
+ type OracleValue = Value;
}
pub type ModuleOracle = Module<Test>;
--
GitLab