Kaynağa Gözat

travis: test recompiling runtime with cargo cache enabled

Mokhtar Naamani 4 yıl önce
ebeveyn
işleme
e0ccff708e
4 değiştirilmiş dosya ile 6 ekleme ve 27 silme
  1. 1 1
      Cargo.lock
  2. 1 1
      runtime/Cargo.toml
  3. 1 1
      runtime/src/lib.rs
  4. 3 24
      runtime/src/migration.rs

+ 1 - 1
Cargo.lock

@@ -1614,7 +1614,7 @@ dependencies = [
 
 [[package]]
 name = "joystream-node-runtime"
-version = "6.13.0"
+version = "6.14.0"
 dependencies = [
  "parity-scale-codec",
  "safe-mix",

+ 1 - 1
runtime/Cargo.toml

@@ -5,7 +5,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '6.13.0'
+version = '6.14.0'
 
 [features]
 default = ['std']

+ 1 - 1
runtime/src/lib.rs

@@ -142,7 +142,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 6,
-    spec_version: 13,
+    spec_version: 14,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
 };

+ 3 - 24
runtime/src/migration.rs

@@ -3,7 +3,7 @@
 
 use crate::VERSION;
 use rstd::prelude::*;
-use sr_primitives::{print, traits::Zero};
+// use sr_primitives::{print, traits::Zero};
 use srml_support::{debug, decl_event, decl_module, decl_storage};
 
 impl<T: Trait> Module<T> {
@@ -12,37 +12,16 @@ impl<T: Trait> Module<T> {
     /// Important to note this method should be carefully maintained, because it runs on every runtime
     /// upgrade.
     fn runtime_upgraded() {
-        print("Running runtime upgraded handler");
+        debug::print!("Running runtime upgraded handler");
 
         // Add initialization of modules introduced in new runtime release. Typically this
         // would be any new storage values that need an initial value which would not
         // have been initialized with config() or build() chainspec construction mechanism.
         // Other tasks like resetting values, migrating values etc.
-
-        // Runtime Upgrade Code for going from Rome to Constantinople
-
-        // Create the Council mint. If it fails, we can't do anything about it here.
-        if let Err(err) = governance::council::Module::<T>::create_new_council_mint(
-            minting::BalanceOf::<T>::zero(),
-        ) {
-            debug::warn!(
-                "Failed to create a mint for council during migration: {:?}",
-                err
-            );
-        }
-
-        // Initialise the proposal system various periods
-        proposals_codex::Module::<T>::set_default_config_values();
     }
 }
 
-pub trait Trait:
-    system::Trait
-    + governance::election::Trait
-    + content_working_group::Trait
-    + roles::actors::Trait
-    + proposals_codex::Trait
-{
+pub trait Trait: system::Trait {
     type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
 }