feat: add customize fn

paritytech · May 5, 2023 · c1cdf03 · c1cdf03
1 parent a8d7b97
commit c1cdf03
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 21 deletions.
diff --git a/deps/std/collections/deep_merge.ts b/deps/std/collections/deep_merge.ts
diff --git a/nets/DevNetSpec.ts b/nets/DevNetSpec.ts
@@ -14,20 +14,20 @@ export interface DevNetProps {
   bin: BinaryResolver
   chain: string
   nodeCount?: number
-  genesis?: Record<string, unknown>
+  customize?: (chainSpec: Record<string, unknown>) => void
 }
 
 export abstract class DevNetSpec extends NetSpec {
   readonly binary
   readonly chain
   readonly nodeCount
-  readonly genesis
+  readonly customize
   constructor(props: DevNetProps) {
     super()
     this.binary = props.bin
     this.chain = props.chain
     this.nodeCount = props.nodeCount
-    this.genesis = props.genesis
+    this.customize = props.customize
   }
 
   abstract relay: DevRelaySpec

diff --git a/nets/DevParachainSpec.ts b/nets/DevParachainSpec.ts
@@ -1,10 +1,8 @@
-import { deepMerge } from "../deps/std/collections/deep_merge.ts"
 import {
   addDevUsers,
   createCustomChainSpec,
   exportParachainGenesis,
   getGenesisConfig,
-  setGenesisConfig,
 } from "./chain_spec/mod.ts"
 import { DevNetProps, DevNetSpec } from "./DevNetSpec.ts"
 import { DevRelaySpec } from "./DevRelaySpec.ts"
@@ -37,7 +35,7 @@ export class DevParachainSpec extends DevNetSpec {
         const genesisConfig = getGenesisConfig(chainSpec)
         genesisConfig.parachainInfo && (genesisConfig.parachainInfo.parachainId = this.id)
         addDevUsers(genesisConfig)
-        setGenesisConfig(chainSpec, deepMerge(genesisConfig, this.genesis ?? {}))
+        this.customize?.(chainSpec)
       },
     )
     const genesis = await exportParachainGenesis(binary, chainSpecPath, signal)

diff --git a/nets/DevRelaySpec.ts b/nets/DevRelaySpec.ts
@@ -1,12 +1,10 @@
-import { deepMerge } from "../deps/std/collections/deep_merge.ts"
 import {
   addAuthorities,
   addDevUsers,
   addXcmHrmpChannels,
   createCustomChainSpec,
   GenesisConfig,
   getGenesisConfig,
-  setGenesisConfig,
 } from "./chain_spec/mod.ts"
 import { DevNet, DevNetSpec, spawnDevNet } from "./DevNetSpec.ts"
 import { DevParachainProps, DevParachainSpec } from "./DevParachainSpec.ts"
@@ -50,7 +48,7 @@ export class DevRelaySpec extends DevNetSpec {
       }
       addAuthorities(genesisConfig, minValidators)
       addDevUsers(genesisConfig)
-      setGenesisConfig(chainSpec, deepMerge(genesisConfig, this.genesis ?? {}))
+      this.customize?.(chainSpec)
     })
   }
 

diff --git a/nets/chain_spec/ChainSpec.ts b/nets/chain_spec/ChainSpec.ts
@@ -4,6 +4,7 @@ export interface ChainSpec {
   genesis: {
     runtime: GenesisConfig | { runtime_genesis_config: GenesisConfig }
   }
+  [key: string]: unknown
 }
 
 export interface GenesisConfig {
@@ -37,7 +38,6 @@ export interface GenesisConfig {
       maxMessageSize: number,
     ][]
   }
-  [key: string]: unknown
 }
 
 export interface SessionKey {

diff --git a/nets/chain_spec/mod.ts b/nets/chain_spec/mod.ts
@@ -8,4 +8,3 @@ export * from "./createCustomChainSpec.ts"
 export * from "./createRawChainSpec.ts"
 export * from "./exportParachainGenesis.ts"
 export * from "./getGenesisConfig.ts"
-export * from "./setGenesisConfig.ts"
diff --git a/nets/chain_spec/setGenesisConfig.ts b/nets/chain_spec/setGenesisConfig.ts