revert naming conventions

Author: mattsse

pallets/committee/src/tests.rs

@@ -488,7 +488,7 @@ fn propose_constituent_works() {
         ));
 
         // test if proposal submitted with event
-        if let Event::Committee(crate::Event::Proposed(_, _, hash)) = last_event() {
+        if let Event::pallet_committee(crate::Event::Proposed(_, _, hash)) = last_event() {
             assert_eq!(&[hash], Committee::active_proposals().as_slice());
 
             // vote Aye on adding new constituent

pallets/price-feed/Cargo.toml

@@ -21,11 +21,12 @@ frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch =
 pallet-chainlink-feed = { git = 'https://github.com/ChainSafe/chainlink-polkadot', branch = 'upgrade-substrate-master', default-features = false }
 
 [dev-dependencies]
+serde = { version = "1.0.101" }
 sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.4', default-features = false }
 sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.4', default-features = false }
 sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.4', default-features = false }
 
-pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.4', default-features = false }
+pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.4' }
 
 
 [features]

pallets/price-feed/src/mock.rs

@@ -94,7 +94,6 @@ parameter_types! {
 
 pub(crate) type FeedId = u16;
 pub(crate) type Value = u128;
-
 impl pallet_chainlink_feed::Config for Test {
     type Event = Event;
     type FeedId = FeedId;
@@ -106,7 +105,7 @@ impl pallet_chainlink_feed::Config for Test {
     type OracleCountLimit = OracleLimit;
     type FeedLimit = FeedLimit;
     type OnAnswerHandler = ();
-    type WeightInfo = ();
+    type WeightInfo = pallet_chainlink_feed::default_weights::WeightInfo<Test>;
 }
 
 pub(crate) type AssetId = u64;