Remove circular deps (#2232)

* Removing circular dependencies

Author: ineiti

bevm/bevm_attr_test.go

@@ -122,6 +122,7 @@ func TestAttrBevm(t *testing.T) {
 	// Create new ledger
 	cl, _, err := byzcoin.NewLedger(genesisMsg, false)
 	require.NoError(t, err)
+	require.NoError(t, cl.UseNode(0))
 
 	// Spawn a new BEvm instance
 	bevmID, err := NewBEvm(cl, signer, gDarc)

external/js/cothority/spec/byzcoin/stream.spec.ts

@@ -1,7 +1,7 @@
 import { Log } from "../../src";
 import ByzCoinRPC from "../../src/byzcoin/byzcoin-rpc";
 import { PaginateRequest, PaginateResponse } from "../../src/byzcoin/proto/stream";
-import { WebSocketConnection } from "../../src/network/connection";
+import { WebSocketConnection } from "../../src/network";
 import { BLOCK_INTERVAL, ROSTER, SIGNER, startConodes } from "../support/conondes";
 
 describe("Stream Tests", () => {

external/js/cothority/spec/network/connection.spec.ts

@@ -1,11 +1,11 @@
 import { Message } from "protobufjs/light";
-import { BrowserWebSocketAdapter } from "../../src/network";
 import {
+    BrowserWebSocketAdapter,
     LeaderConnection,
     RosterWSConnection,
     setFactory,
     WebSocketConnection,
-} from "../../src/network/connection";
+} from "../../src/network";
 import { Roster, ServerIdentity } from "../../src/network/proto";
 import { ROSTER } from "../support/conondes";
 import TestWebSocket from "./websocket-test-adapter";
@@ -177,9 +177,15 @@ describe("WebSocketAdapter Tests with sendStream", () => {
         const msg = new Roster();
 
         conn.sendStream(msg, Roster).subscribe({
-            complete: () => {throw new Error("should not complete"); },
-            error: () => {throw new Error("should not get error"); },
-            next: () => {done(); },
+            complete: () => {
+                throw new Error("should not complete");
+            },
+            error: () => {
+                throw new Error("should not get error");
+            },
+            next: () => {
+                done();
+            },
         });
     });
 
@@ -190,12 +196,16 @@ describe("WebSocketAdapter Tests with sendStream", () => {
         const msg = new Roster();
 
         conn.sendStream(msg, Roster).subscribe({
-            complete: () => {throw new Error("should not complete"); },
+            complete: () => {
+                throw new Error("should not complete");
+            },
             error: (err: Error) => {
                 expect(err).toEqual(new Error("reason to close"));
                 done();
             },
-            next: () => {throw new Error("should not get value"); },
+            next: () => {
+                throw new Error("should not get value");
+            },
         });
     });
 
@@ -207,12 +217,16 @@ describe("WebSocketAdapter Tests with sendStream", () => {
         const msg = new Roster();
 
         conn.sendStream(msg, Roster).subscribe({
-            complete: () => {throw new Error("should not complete"); },
+            complete: () => {
+                throw new Error("should not complete");
+            },
             error: (err: Error) => {
                 expect(err).toEqual(new Error("timeout"));
                 done();
             },
-            next: () => {throw new Error("should not get value"); },
+            next: () => {
+                throw new Error("should not get value");
+            },
         });
     });
 
@@ -222,9 +236,13 @@ describe("WebSocketAdapter Tests with sendStream", () => {
         const conn = new WebSocketConnection("http://example.com", "");
 
         conn.sendStream(new Roster(), Roster).subscribe({
-            complete: () => {throw new Error("shouldn't complete"); },
+            complete: () => {
+                throw new Error("shouldn't complete");
+            },
             error: () => done(),
-            next: () => {throw new Error("should not get value"); },
+            next: () => {
+                throw new Error("should not get value");
+            },
         });
     });
 

external/js/cothority/spec/skipchain/skipchain-rpc.spec.ts

@@ -1,6 +1,5 @@
 import Log from "../../src/log";
-import { Roster } from "../../src/network";
-import { RosterWSConnection, WebSocketConnection } from "../../src/network/connection";
+import { Roster, RosterWSConnection, WebSocketConnection } from "../../src/network";
 import { SkipBlock, SkipchainRPC } from "../../src/skipchain";
 import { ROSTER, startConodes } from "../support/conondes";
 

external/js/cothority/spec/support/conondes.ts

@@ -4,7 +4,7 @@ import fs from "fs";
 import Long from "long";
 
 import SignerEd25519 from "../../src/darc/signer-ed25519";
-import { RosterWSConnection } from "../../src/network/connection";
+import { RosterWSConnection } from "../../src/network";
 import { Roster } from "../../src/network/proto";
 
 const docker = new Docker();

external/js/cothority/src/byzcoin/byzcoin-rpc.ts

@@ -6,9 +6,7 @@ import { Rule } from "../darc";
 import Darc from "../darc/darc";
 import IdentityEd25519 from "../darc/identity-ed25519";
 import IdentityWrapper, { IIdentity } from "../darc/identity-wrapper";
-import { WebSocketAdapter } from "../network";
-import { IConnection, LeaderConnection, RosterWSConnection } from "../network/connection";
-import { Roster } from "../network/proto";
+import { IConnection, LeaderConnection, Roster, RosterWSConnection, WebSocketAdapter } from "../network";
 import { SkipBlock } from "../skipchain/skipblock";
 import SkipchainRPC from "../skipchain/skipchain-rpc";
 import ClientTransaction, { ICounterUpdater } from "./client-transaction";

external/js/cothority/src/byzcoin/index.ts

@@ -1,4 +1,4 @@
-import ByzCoinRPC, { CONFIG_INSTANCE_ID } from "./byzcoin-rpc";
+import ByzCoinRPC, { CONFIG_INSTANCE_ID, IStorage, LocalCache } from "./byzcoin-rpc";
 import ClientTransaction, { Argument, Instruction } from "./client-transaction";
 import ChainConfig from "./config";
 import Instance, { InstanceID } from "./instance";
@@ -15,4 +15,6 @@ export {
     StateChangeBody,
     Instance,
     InstanceID,
+    IStorage,
+    LocalCache,
 };

external/js/cothority/src/calypso/calypso-rpc.ts

@@ -3,8 +3,8 @@ import { Message, Properties } from "protobufjs/light";
 import { Argument, ClientTransaction, InstanceID, Instruction, Proof } from "../byzcoin";
 import ByzCoinRPC from "../byzcoin/byzcoin-rpc";
 import { Signer } from "../darc";
-import { Roster, ServerIdentity } from "../network";
-import { IConnection, RosterWSConnection, WebSocketConnection } from "../network/connection";
+import { IConnection, Roster, ServerIdentity, WebSocketConnection } from "../network";
+import { RosterWSConnection } from "../network";
 import { registerMessage } from "../protobuf";
 import { DecodeKey, OnChainSecretInstance } from "./calypso-instance";