Bläddra i källkod

added ContentWorkingGroup and correct docker_compose

ignazio-bovo 3 år sedan
förälder
incheckning
4d8abc8b6b
3 ändrade filer med 13 tillägg och 4 borttagningar
  1. 1 1
      docker-compose.yml
  2. 12 2
      runtime/src/runtime_api.rs
  3. 0 1
      tests/network-tests/run-tests.sh

+ 1 - 1
docker-compose.yml

@@ -4,7 +4,7 @@
 version: '3.4'
 services:
   joystream-node:
-    image: joystream/node:giza
+    image: joystream/node:latest
     build:
       # context is relative to the compose file
       context: .

+ 12 - 2
runtime/src/runtime_api.rs

@@ -22,8 +22,8 @@ use crate::{
 };
 
 use crate::{
-    OperationsWorkingGroupInstanceAlpha, OperationsWorkingGroupInstanceBeta,
-    OperationsWorkingGroupInstanceGamma,
+    ContentWorkingGroupInstance, OperationsWorkingGroupInstanceAlpha,
+    OperationsWorkingGroupInstanceBeta, OperationsWorkingGroupInstanceGamma,
 };
 use frame_support::weights::Weight;
 
@@ -71,6 +71,8 @@ pub(crate) type OperationsWorkingGroupBeta<T> =
 pub(crate) type OperationsWorkingGroupGamma<T> =
     working_group::Module<T, OperationsWorkingGroupInstanceGamma>;
 
+pub(crate) type ContentWorkingGroup<T> = working_group::Module<T, ContentWorkingGroupInstance>;
+
 /// Custom runtime upgrade handler.
 pub struct CustomOnRuntimeUpgrade;
 impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
@@ -110,6 +112,14 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
             default_content_working_group_mint_capacity,
         );
 
+        ContentWorkingGroup::<Runtime>::initialize_working_group(
+            default_text_constraint,
+            default_text_constraint,
+            default_text_constraint,
+            default_storage_size_constraint,
+            default_content_working_group_mint_capacity,
+        );
+
         10_000_000 // TODO: adjust weight
     }
 }

+ 0 - 1
tests/network-tests/run-tests.sh

@@ -93,7 +93,6 @@ else
 
   echo "Performing migration tests"
   ./run-migration-tests.sh $1
-
   echo "Done with migrations tests"
 fi