The New Transaction System's tests

.github/workflows/go_integration_tests.yml

@@ -2,23 +2,64 @@ name: Go Integration Test
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
-
-  test:
-    name: Tests
+  integration:
+    name: Test Integration
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go ^1.17
         uses: actions/setup-go@v2
         with:
           go-version: ^1.17
-        
+
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
-        
+
       - name: Run the integration test
-        run: go test -timeout 7m -run TestIntegration ./integration/...
+        run: go test -timeout 10m -run TestIntegration ./integration/... 
+  bad_vote:
+    name: Test bad vote
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go ^1.17
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Run the bad vote test
+        run: go test -timeout 10m -run TestBadVote ./integration/...
+  crash:
+    name: Test crash
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go ^1.17
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Run the crash test
+        run: go test -timeout 10m -run TestCrash ./integration/...
+  revote:
+    name: Test revote
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go ^1.17
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Run the revote test
+        run: go test -timeout 10m -run TestRevote ./integration/...

.github/workflows/go_scenario_test.yml

@@ -2,12 +2,11 @@ name: Go Scenario Test (with proxy)
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
-
   test:
     name: Tests
     runs-on: ubuntu-latest
@@ -22,18 +21,18 @@ jobs:
           git clone https://github.com/dedis/dela.git
           cd dela
           go install ./cli/crypto
-        
+
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
-      
+
       - name: Create a private key
         run: crypto bls signer new --save private.key
 
       - name: Install memcoin
         run: make build
 
-      - name: Start and setup 3 nodes
-        run: ./runSystems.sh -n 3 --docker false --backend false --frontend false --attach false
+      - name: Start and setup 5 nodes
+        run: ./runSystems.sh -n 5 --docker false --backend false --frontend false --attach false
 
       - name: Run the scenario Test
         run: go test -timeout 7m -run TestScenario ./integration/...

contracts/evoting/controller/action.go

@@ -91,12 +91,13 @@ func (a *RegisterAction) Execute(ctx node.Context) error {
 		return xerrors.Errorf("failed to resolve ordering.Service: %v", err)
 	}
 
-	var blocks *blockstore.InDisk
+	var blocks blockstore.BlockStore
 	err = ctx.Injector.Resolve(&blocks)
 	if err != nil {
 		return xerrors.Errorf("failed to resolve blockstore.InDisk: %v", err)
 	}
 
+
 	var ordering ordering.Service
 
 	err = ctx.Injector.Resolve(&ordering)
@@ -163,11 +164,12 @@ func (a *RegisterAction) Execute(ctx node.Context) error {
 		return xerrors.Errorf("failed to unmarshal proxy key: %v", err)
 	}
 
-	ep := eproxy.NewForm(ordering, mngr, p, sjson.NewContext(), formFac, proxykey)
+	ep := eproxy.NewForm(ordering, mngr, p, sjson.NewContext(), formFac, proxykey,blocks,signer)
 
 	router := mux.NewRouter()
 
 	router.HandleFunc(formPath, ep.NewForm).Methods("POST")
+	router.HandleFunc("/evoting/transactions/{token}", ep.IsTxnIncluded).Methods("GET")
 	router.HandleFunc(formPath, ep.Forms).Methods("GET")
 	router.HandleFunc(formPath, eproxy.AllowCORS).Methods("OPTIONS")
 	router.HandleFunc(formIDPath, ep.Form).Methods("GET")
@@ -181,6 +183,8 @@ func (a *RegisterAction) Execute(ctx node.Context) error {
 
 	proxy.RegisterHandler(formPath, router.ServeHTTP)
 	proxy.RegisterHandler(formPathSlash, router.ServeHTTP)
+	proxy.RegisterHandler("/evoting/transactions", router.ServeHTTP)
+	proxy.RegisterHandler("/evoting/transactions/", router.ServeHTTP)
 
 	dela.Logger.Info().Msg("d-voting proxy handlers registered")