fix: remove dynamic role from sim-chain

Agoric · Aug 23, 2020 · 1a3dd57 · 1a3dd57
1 parent 3fd1e1d
commit 1a3dd57
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/packages/agoric-cli/lib/start.js b/packages/agoric-cli/lib/start.js
@@ -150,7 +150,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       log(chalk.yellow(`setting sim chain with ${fakeDelay} second delay`));
       await pspawn(
         agSolo,
-        ['set-fake-chain', '--role=two_chain', `--delay=${fakeDelay}`, fakeGCI],
+        ['set-fake-chain', `--delay=${fakeDelay}`, fakeGCI],
         {
           cwd: agServer,
         },
@@ -162,7 +162,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       return 0;
     }
 
-    const ps = pspawn(agSolo, [...debugOpts, 'start', '--role=two_client'], {
+    const ps = pspawn(agSolo, [...debugOpts, 'start'], {
       cwd: agServer,
     });
     process.on('SIGINT', () => ps.cp.kill('SIGINT'));
@@ -475,9 +475,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     // Now actually start the solo.
-    return soloSpawn(['start', '--role=two_client'], spawnOpts, [
-      `--publish=${portNum}:${portNum}`,
-    ]);
+    return soloSpawn(['start'], spawnOpts, [`--publish=${portNum}:${portNum}`]);
   }
 
   async function startTestnetDocker(profileName, startArgs, popts) {

diff --git a/packages/cosmic-swingset/lib/ag-solo/fake-chain.js b/packages/cosmic-swingset/lib/ag-solo/fake-chain.js
@@ -33,7 +33,7 @@ async function writeMap(file, map) {
   await fs.promises.writeFile(file, json);
 }
 
-export async function connectToFakeChain(basedir, GCI, role, delay, inbound) {
+export async function connectToFakeChain(basedir, GCI, delay, inbound) {
   const mailboxFile = path.join(basedir, `fake-chain-${GCI}-mailbox.json`);
   const bootAddress = `${GCI}-client`;
 

diff --git a/packages/cosmic-swingset/lib/ag-solo/main.js b/packages/cosmic-swingset/lib/ag-solo/main.js
@@ -122,9 +122,9 @@ start
     }
     case 'set-fake-chain': {
       const basedir = insistIsBasedir();
-      const { _: subArgs, role, delay } = parseArgs(argv.slice(1), {});
+      const { _: subArgs, delay } = parseArgs(argv.slice(1), {});
       const GCI = subArgs[0];
-      setFakeChain(basedir, GCI, role, delay);
+      setFakeChain(basedir, GCI, delay);
       break;
     }
     case 'start': {

diff --git a/packages/cosmic-swingset/lib/ag-solo/set-fake-chain.js b/packages/cosmic-swingset/lib/ag-solo/set-fake-chain.js
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 
-export default function setFakeChain(basedir, GCI, role, fakeDelay) {
+export default function setFakeChain(basedir, GCI, fakeDelay) {
   const fn = path.join(basedir, 'connections.json');
   const connsByType = {};
   const add = c => {
@@ -34,7 +34,6 @@ export default function setFakeChain(basedir, GCI, role, fakeDelay) {
     type: 'fake-chain',
     GCI,
     fakeDelay,
-    role,
   };
   add(newconn);
   const connections = [];

diff --git a/packages/cosmic-swingset/lib/ag-solo/start.js b/packages/cosmic-swingset/lib/ag-solo/start.js
@@ -274,11 +274,10 @@ export default async function start(basedir, argv) {
           }
           break;
         case 'fake-chain': {
-          log(`adding follower/sender for fake chain ${c.role} ${c.GCI}`);
+          log(`adding follower/sender for fake chain ${c.GCI}`);
           const deliverator = await connectToFakeChain(
             basedir,
             c.GCI,
-            c.role,
             c.fakeDelay,
             deliverInboundToMbx,
           );