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
before · Cargo.lock
957 packageslockfile v3
after · Cargo.lock
957 packageslockfile v3
modifiedpallets/inflation/src/tests.rsdiffbeforeafterboth
--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -104,13 +104,16 @@
 		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
 		assert_eq!(Balances::free_balance(1234), initial_issuance);
 
-		// BlockInflation should be set after 1st block and 
+		// BlockInflation should be set after 1st block and
 		// first inflation deposit should be equal to BlockInflation
 		Inflation::on_initialize(1);
 
 		// SBP M2 review: Verify expected block inflation for year 1
 		assert_eq!(Inflation::block_inflation(), 1901);
-		assert_eq!(Balances::free_balance(1234) - initial_issuance, Inflation::block_inflation());
+		assert_eq!(
+			Balances::free_balance(1234) - initial_issuance,
+			Inflation::block_inflation()
+		);
 	});
 }
 
@@ -192,7 +195,6 @@
 			// Assert that next year inflation is less than previous year inflation
 			assert!(block_inflation_year_before > block_inflation_year_after);
 		}
-
 	});
 }