Skip to content

Commit 9926f4b

Browse files
shaunxwshaunxw
authored
Update dependencies. (#341)
1 parent 266518f commit 9926f4b

File tree

3 files changed

+56
-30
lines changed

3 files changed

+56
-30
lines changed

‎Cargo.dev.toml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ members = [
1515
]
1616

1717
[patch.crates-io]
18-
frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
19-
frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
20-
frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
21-
pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
22-
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
23-
pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
24-
pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
25-
sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
26-
sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
27-
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
28-
sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
29-
sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
30-
sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
31-
sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
32-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
33-
sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
34-
sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
35-
sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "6b600cdeb4043e512bc5f342eb02a5a17d26797a" }
18+
frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
19+
frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
20+
frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
21+
pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
22+
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
23+
pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
24+
pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
25+
sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
26+
sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
27+
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
28+
sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
29+
sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
30+
sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
31+
sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
32+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
33+
sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
34+
sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
35+
sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }

‎tokens/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ orml-traits = { path = "../traits", version = "0.3.3-dev", default-features = fa
2222
[dev-dependencies]
2323
sp-core = { version = "2.0.0", default-features = false }
2424
pallet-treasury = { version = "2.0.0" }
25+
#TODO: use cargo version once `bounties` and `tips` pallets are released.
26+
pallet-bounties = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
27+
pallet-tips = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
2528
pallet-elections-phragmen = { version = "2.0.0" }
2629

2730
clear_on_drop = { version = "0.2.4", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179

‎tokens/src/mock.rs‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ impl_outer_event! {
4444
frame_system<T>,
4545
tokens<T>,
4646
pallet_treasury<T>,
47+
pallet_bounties<T>,
48+
pallet_tips<T>,
4749
pallet_elections_phragmen<T>,
4850
}
4951
}
@@ -125,34 +127,55 @@ parameter_types! {
125127
pub const Burn: Permill = Permill::from_percent(50);
126128
pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
127129
pub const GetTokenId: CurrencyId = DOT;
130+
pub const BountyDepositBase: Balance = 1;
131+
pub const BountyDepositPayoutDelay: u64 = 1;
132+
pub const BountyUpdatePeriod: u64 = 1;
133+
pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
134+
pub const BountyValueMinimum: Balance = 5;
135+
pub const MaximumReasonLength: u32 = 16384;
128136
}
129137

130138
impl pallet_treasury::Config for Runtime {
131139
type ModuleId = TreasuryModuleId;
132140
type Currency = CurrencyAdapter<Runtime, GetTokenId>;
133141
type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
134142
type RejectOrigin = frame_system::EnsureRoot<AccountId>;
135-
type Tippers = TenToFourteen;
136-
type TipCountdown = TipCountdown;
137-
type TipFindersFee = TipFindersFee;
138-
type TipReportDepositBase = TipReportDepositBase;
139-
type DataDepositPerByte = DataDepositPerByte;
140143
type Event = TestEvent;
141144
type OnSlash = ();
142145
type ProposalBond = ProposalBond;
143146
type ProposalBondMinimum = ProposalBondMinimum;
144147
type SpendPeriod = SpendPeriod;
145148
type Burn = Burn;
146-
type BurnDestination = (); // Just gets burned.
147-
type BountyDepositBase = ();
148-
type BountyDepositPayoutDelay = ();
149-
type BountyUpdatePeriod = ();
150-
type BountyCuratorDeposit = ();
151-
type BountyValueMinimum = ();
152-
type MaximumReasonLength = ();
149+
type BurnDestination = ();
150+
type SpendFunds = Bounties;
151+
type WeightInfo = ();
152+
}
153+
154+
impl pallet_bounties::Config for Runtime {
155+
type Event = TestEvent;
156+
type BountyDepositBase = BountyDepositBase;
157+
type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
158+
type BountyUpdatePeriod = BountyUpdatePeriod;
159+
type BountyCuratorDeposit = BountyCuratorDeposit;
160+
type BountyValueMinimum = BountyValueMinimum;
161+
type DataDepositPerByte = DataDepositPerByte;
162+
type MaximumReasonLength = MaximumReasonLength;
153163
type WeightInfo = ();
154164
}
165+
166+
impl pallet_tips::Config for Runtime {
167+
type Event = TestEvent;
168+
type DataDepositPerByte = DataDepositPerByte;
169+
type MaximumReasonLength = MaximumReasonLength;
170+
type Tippers = TenToFourteen;
171+
type TipCountdown = TipCountdown;
172+
type TipFindersFee = TipFindersFee;
173+
type TipReportDepositBase = TipReportDepositBase;
174+
type WeightInfo = ();
175+
}
176+
155177
pub type Treasury = pallet_treasury::Module<Runtime>;
178+
pub type Bounties = pallet_bounties::Module<Runtime>;
156179

157180
thread_local! {
158181
pub static MEMBERS: RefCell<Vec<AccountId>> = RefCell::new(vec![]);

0 commit comments

Comments
 (0)