Skip to content
Snippets Groups Projects
Unverified Commit 4a26ce44 authored by Xiliang Chen's avatar Xiliang Chen Committed by GitHub
Browse files

update substrate (#84)

parent de04cf5b
No related branches found
No related tags found
No related merge requests found
......@@ -37,9 +37,9 @@ type AuctionIdLinkedItem<T> = LinkedItem<<T as Trait>::AuctionId>;
decl_storage! {
trait Store for Module<T: Trait> as Auction {
pub Auctions get(fn auctions): map T::AuctionId => Option<AuctionInfo<T::AccountId, T::Balance, T::BlockNumber>>;
pub Auctions get(fn auctions): map hasher(blake2_256) T::AuctionId => Option<AuctionInfo<T::AccountId, T::Balance, T::BlockNumber>>;
pub AuctionsIndex get(fn auctions_index): T::AuctionId;
pub AuctionEndTime get(fn auction_end_time): map(T::BlockNumber, Option<T::AuctionId>) => Option<AuctionIdLinkedItem<T>>;
pub AuctionEndTime get(fn auction_end_time): map hasher(blake2_256) (T::BlockNumber, Option<T::AuctionId>) => Option<AuctionIdLinkedItem<T>>;
}
}
......
......@@ -33,9 +33,9 @@ pub trait Trait: frame_system::Trait {
decl_storage! {
trait Store for Module<T: Trait> as Oracle {
pub RawValues get(raw_values): double_map T::OracleKey, T::AccountId => Option<TimestampedValueOf<T>>;
pub HasUpdate get(has_update): map T::OracleKey => bool;
pub Values get(values): map T::OracleKey => Option<TimestampedValueOf<T>>;
pub RawValues get(raw_values): double_map hasher(blake2_256) T::OracleKey, hasher(blake2_256) T::AccountId => Option<TimestampedValueOf<T>>;
pub HasUpdate get(has_update): map hasher(blake2_256) T::OracleKey => bool;
pub Values get(values): map hasher(blake2_256) T::OracleKey => Option<TimestampedValueOf<T>>;
}
}
......
#![cfg_attr(not(feature = "std"), no_std)]
use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure, traits::Get, Parameter};
use rstd::{
collections::btree_map::BTreeMap,
convert::{TryFrom, TryInto},
};
use rstd::convert::{TryFrom, TryInto};
use sp_runtime::{
traits::{CheckedAdd, CheckedSub, MaybeSerializeDeserialize, Member, SimpleArithmetic, StaticLookup, Zero},
DispatchResult,
......@@ -14,6 +11,9 @@ use sp_runtime::{
// #3295 https://github.com/paritytech/substrate/issues/3295
use frame_system::{self as system, ensure_signed};
#[cfg(feature = "std")]
use rstd::collections::btree_map::BTreeMap;
use orml_traits::{
arithmetic::{self, Signed},
MultiCurrency, MultiCurrencyExtended, OnDustRemoval,
......@@ -57,10 +57,10 @@ decl_storage! {
})
.into_iter()
.collect::<Vec<_>>()
}): map T::CurrencyId => T::Balance;
}): map hasher(blake2_256) T::CurrencyId => T::Balance;
/// The balance of a token type under an account.
pub Balance get(fn balance): double_map T::CurrencyId, T::AccountId => T::Balance;
pub Balance get(fn balance): double_map hasher(blake2_256) T::CurrencyId, hasher(blake2_256) T::AccountId => T::Balance;
}
add_extra_genesis {
config(endowed_accounts): Vec<(T::AccountId, T::CurrencyId, T::Balance)>;
......
......@@ -172,7 +172,7 @@ mod tests {
decl_storage! {
trait Store for Module<T: Trait> as Test {
pub TestItem get(linked_list): map (Key, Option<Value>) => Option<TestLinkedItem>;
pub TestItem get(linked_list): map hasher(blake2_256) (Key, Option<Value>) => Option<TestLinkedItem>;
}
}
......
......@@ -80,7 +80,7 @@ decl_storage! {
(who.clone(), vec![VestingSchedule {start, period, period_count, per_period}])
)
.collect::<Vec<_>>()
}): map T::AccountId => Vec<VestingScheduleOf<T>>;
}): map hasher(blake2_256) T::AccountId => Vec<VestingScheduleOf<T>>;
}
add_extra_genesis {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment