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
5847 "sp-std",5847 "sp-std",
5848]5848]
5849
5850[[package]]
5851name = "pallet-scheduler"
5852version = "3.0.0"
5853dependencies = [
5854 "frame-benchmarking",
5855 "frame-support",
5856 "frame-system",
5857 "log",
5858 "parity-scale-codec 2.1.3",
5859 "serde",
5860 "sp-core",
5861 "sp-io",
5862 "sp-runtime",
5863 "sp-std",
5864 "substrate-test-utils",
5865 "up-sponsorship",
5866]
58675849
5868[[package]]5850[[package]]
5869name = "pallet-scheduler"5851name = "pallet-scheduler"
5880 "sp-std",5862 "sp-std",
5881]5863]
5864
5865[[package]]
5866name = "pallet-scheduler"
5867version = "3.0.0"
5868dependencies = [
5869 "frame-benchmarking",
5870 "frame-support",
5871 "frame-system",
5872 "log",
5873 "parity-scale-codec 2.1.3",
5874 "serde",
5875 "sp-core",
5876 "sp-io",
5877 "sp-runtime",
5878 "sp-std",
5879 "substrate-test-utils",
5880 "up-sponsorship",
5881]
58825882
5883[[package]]5883[[package]]
5884name = "pallet-session"5884name = "pallet-session"
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