git.delta.rocks / unique-network / refs/commits / 4b9c21e9505c

difftreelog

Resolve conflicts

Greg Zaitsev2021-07-27parents: #13a8824 #40e660f.patch.diff
in: master

2 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5850,34 +5850,34 @@
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.7#9c572625f6557dfdb19f47474369a0327d51dfbc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec 2.1.3",
- "serde",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-test-utils",
- "up-sponsorship",
 ]
 
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.7#9c572625f6557dfdb19f47474369a0327d51dfbc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec 2.1.3",
+ "serde",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "substrate-test-utils",
+ "up-sponsorship",
 ]
 
 [[package]]
modifiedpallets/inflation/src/tests.rsdiffbeforeafterboth
104 let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);104 let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
105 assert_eq!(Balances::free_balance(1234), initial_issuance);105 assert_eq!(Balances::free_balance(1234), initial_issuance);
106106
107 // BlockInflation should be set after 1st block and 107 // BlockInflation should be set after 1st block and
108 // first inflation deposit should be equal to BlockInflation108 // first inflation deposit should be equal to BlockInflation
109 Inflation::on_initialize(1);109 Inflation::on_initialize(1);
110110