Remove old rpc server interface

abdullathedruid · Nov 13, 2020 · dc6673f · dc6673f
1 parent fcaa5c1
commit dc6673f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 312 deletions.
diff --git a/packages/arb-tx-aggregator/aggregator/launch.go b/packages/arb-tx-aggregator/aggregator/launch.go
diff --git a/packages/arb-tx-aggregator/aggregator/server.go b/packages/arb-tx-aggregator/aggregator/server.go
diff --git a/packages/arb-tx-aggregator/cmd/arb-tx-aggregator/arb-tx-aggregator.go b/packages/arb-tx-aggregator/cmd/arb-tx-aggregator/arb-tx-aggregator.go
@@ -113,7 +113,6 @@ func main() {
 		rollupArgs.Address,
 		contractFile,
 		dbPath,
-		"1235",
 		"8547",
 		"8548",
 		rpcVars,

diff --git a/packages/arb-tx-aggregator/rpc/launch.go b/packages/arb-tx-aggregator/rpc/launch.go
@@ -61,7 +61,6 @@ func LaunchAggregator(
 	rollupAddress common.Address,
 	executable string,
 	dbPath string,
-	aggPort string,
 	web3RPCPort string,
 	web3WSPort string,
 	flags utils2.RPCFlags,
@@ -109,21 +108,11 @@ func LaunchAggregator(
 	srv := aggregator.NewServer(client, batch, rollupAddress, db)
 	errChan := make(chan error, 1)
 
-	aggServer, err := aggregator.GenerateRPCServer(srv)
-	if err != nil {
-		return err
-	}
-
 	web3Server, err := web3.GenerateWeb3Server(srv)
 	if err != nil {
 		return err
 	}
 
-	if aggPort != "" {
-		go func() {
-			errChan <- utils2.LaunchRPC(aggServer, aggPort, flags)
-		}()
-	}
 	if web3RPCPort != "" {
 		go func() {
 			errChan <- utils2.LaunchRPC(web3Server, web3RPCPort, flags)

diff --git a/tests/fibgo/connection_test.go b/tests/fibgo/connection_test.go
@@ -139,7 +139,6 @@ func launchAggregator(client ethutils.EthClient, auth *bind.TransactOpts, rollup
 			rollupAddress,
 			contract,
 			db+"/aggregator",
-			"2235",
 			"9546",
 			"9547",
 			utils2.RPCFlags{},
@@ -186,11 +185,6 @@ func launchAggregator(client ethutils.EthClient, auth *bind.TransactOpts, rollup
 	}
 }
 
-type ListenerError struct {
-	ListenerName string
-	Err          error
-}
-
 func waitForReceipt(
 	client bind.DeployBackend,
 	tx *types.Transaction,
@@ -250,9 +244,9 @@ func TestFib(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	//if err := setupValidators(rollupAddress, l1Client, pks[3:5]); err != nil {
-	//	t.Fatalf("Validator setup error %v", err)
-	//}
+	if err := setupValidators(rollupAddress, l1Client, pks[3:5]); err != nil {
+		t.Fatalf("Validator setup error %v", err)
+	}
 
 	if err := launchAggregator(
 		l1Client,
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,6 @@ func main() { @@
     		rollupArgs.Address,
     		contractFile,
     		dbPath,
-    		"1235",
     		"8547",
     		"8548",
     		rpcVars,
@@ Expand Down @@