From e6e402023c1e8107ce0e567a038fbfbf7add12cd Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 4 Oct 2019 13:32:56 -0700
Subject: [PATCH] removes obsolete cli args for eth snapshots (-C and -E)

---
 pkg/urbit/daemon/main.c       | 13 +------------
 pkg/urbit/include/vere/vere.h |  2 --
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c
index 2739b23286..3f44a315ef 100644
--- a/pkg/urbit/daemon/main.c
+++ b/pkg/urbit/daemon/main.c
@@ -71,7 +71,6 @@ _main_getopt(c3_i argc, c3_c** argv)
 
   u3_Host.ops_u.abo = c3n;
   u3_Host.ops_u.bat = c3n;
-  u3_Host.ops_u.can = c3n;
   u3_Host.ops_u.dem = c3n;
   u3_Host.ops_u.dry = c3n;
   u3_Host.ops_u.gab = c3n;
@@ -94,7 +93,7 @@ _main_getopt(c3_i argc, c3_c** argv)
   u3_Host.ops_u.kno_w = DefaultKernel;
 
   while ( -1 != (ch_i=getopt(argc, argv,
-                 "G:J:B:K:A:H:I:w:u:e:E:F:k:p:LljabcCdgqsvxPDRS")) )
+                 "G:J:B:K:A:H:I:w:u:e:F:k:p:LljabcdgqsvxPDRS")) )
   {
     switch ( ch_i ) {
       case 'J': {
@@ -125,10 +124,6 @@ _main_getopt(c3_i argc, c3_c** argv)
         u3_Host.ops_u.eth_c = strdup(optarg);
         break;
       }
-      case 'E': {
-        u3_Host.ops_u.ets_c = strdup(optarg);
-        break;
-      }
       case 'F': {
         u3_Host.ops_u.fak_c = _main_presig(optarg);
         u3_Host.ops_u.net   = c3n;
@@ -173,7 +168,6 @@ _main_getopt(c3_i argc, c3_c** argv)
       case 'a': { u3_Host.ops_u.abo = c3y; break; }
       case 'b': { u3_Host.ops_u.bat = c3y; break; }
       case 'c': { u3_Host.ops_u.nuu = c3y; break; }
-      case 'C': { u3_Host.ops_u.can = c3y; break; }
       case 'd': { u3_Host.ops_u.dem = c3y; break; }
       case 'g': { u3_Host.ops_u.gab = c3y; break; }
       case 'P': { u3_Host.ops_u.pro = c3y; break; }
@@ -287,11 +281,6 @@ _main_getopt(c3_i argc, c3_c** argv)
     return c3n;
   }
 
-  if ( u3_Host.ops_u.can == c3y && u3_Host.ops_u.ets_c != 0 ) {
-    fprintf(stderr, "-C and -E cannot be used together\n");
-    return c3n;
-  }
-
   if ( u3_Host.ops_u.eth_c == 0 && imp_t ) {
     u3_Host.ops_u.eth_c = "http://eth-mainnet.urbit.org:8545";
   }
diff --git a/pkg/urbit/include/vere/vere.h b/pkg/urbit/include/vere/vere.h
index 652fe9f401..0476bcd16e 100644
--- a/pkg/urbit/include/vere/vere.h
+++ b/pkg/urbit/include/vere/vere.h
@@ -544,11 +544,9 @@
         c3_o    abo;                        //  -a, abort aggressively
         c3_c*   pil_c;                      //  -B, bootstrap from
         c3_o    bat;                        //  -b, batch create
-        c3_o    can;                        //  -C, chain-only, no eth snapshot
         c3_o    nuu;                        //  -c, new pier
         c3_o    dry;                        //  -D, dry compute, no checkpoint
         c3_o    dem;                        //  -d, daemon
-        c3_c*   ets_c;                      //  -E, eth snapshot
         c3_c*   eth_c;                      //  -e, ethereum node url
         c3_c*   fak_c;                      //  -F, fake ship
         c3_c*   gen_c;                      //  -G, czar generator