Fix filter checking and disable platform-dependent tests

Author: ghareeb-falazi

src/main/java/blockchains/iaas/uni/stuttgart/de/adaptation/adapters/ethereum/EthereumAdapter.java

@@ -354,14 +354,13 @@ public Observable<Occurrence> subscribeToEvent(String smartContractAddress, Stri
             for (int i = 0; i < outputParameters.size(); i++) {
                 parameters.add(Parameter.builder()
                         .name(outputParameters.get(i).getName())
+                        .type(outputParameters.get(i).getType())
                         .value(ParameterDecoder.decode(values.getNonIndexedValues().get(i)))
                         .build());
             }
 
             if (BooleanExpressionEvaluator.evaluate(filter, parameters)) {
-
                 EthBlock block = this.web3j.ethGetBlockByHash(log.getBlockHash(), false).send();
-
                 subscribeForTxEvent(log.getTransactionHash(), waitFor, TransactionState.CONFIRMED)
                         .thenAccept(tx -> {
                             LocalDateTime timestamp = LocalDateTime.ofEpochSecond(block.getBlock().getTimestamp().longValue(), 0, ZoneOffset.UTC);

src/main/java/blockchains/iaas/uni/stuttgart/de/adaptation/adapters/fabric/FabricAdapter.java

@@ -142,6 +142,7 @@ public Observable<Occurrence> subscribeToEvent(
                     Parameter parameter = Parameter
                             .builder()
                             .name(outputParameters.get(0).getName())
+                            .type(outputParameters.get(0).getType())
                             .value(new String(event.getPayload().get(), StandardCharsets.UTF_8))
                             .build();
                     parameters.add(parameter);

src/test/java/blockchains/iaas/uni/stuttgart/de/adaptation/adapters/ethereum/EthereumAdapterTest.java

@@ -44,6 +44,7 @@
  * To run these tests, you need ganache with the following mnemonic:
  * smart contract composition
  */
+@Disabled
 class EthereumAdapterTest {
     private static final String NETWORK_NAME = "eth-0";
     private static final String MESSAGE = "This was not a difficult task!";

src/test/java/blockchains/iaas/uni/stuttgart/de/adaptation/adapters/fabric/FabricAdapterTest.java

@@ -42,7 +42,7 @@
  *
  * This ensures that the SDK is able to find the orderer and network peers.
  */
-
+@Disabled
 class FabricAdapterTest {
     private static final String NETWORK_NAME = "fabric-0";
     private static final String CHANNEL_NAME = "mychannel";

src/test/resources/gatewayConfiguration.json

@@ -1,7 +1,7 @@
 {
   "eth-0": {
     "@type": "ethereum",
-    "nodeUrl":"http://localhost:7545",
+    "nodeUrl":"http://localhost:8545",
     "keystorePath":"C:\\Ethereum\\keystore\\UTC--2019-05-30T11-21-08.970000000Z--90645dc507225d61cb81cf83e7470f5a6aa1215a.json",
     "keystorePassword":"123456789",
     "adversaryVotingRatio": "0.2"
@@ -21,7 +21,7 @@
   },
   "fabric-0" : {
     "@type": "fabric",
-    "walletPath": "C:\\Users\\falazigb\\Documents\\GitHub\\fabric\\fabric-samples\\fabcar\\javascript\\wallet",
+    "walletPath": "C:\\Users\\falazigb\\Documents\\GitHub\\fabric\\fabric-samples\\emc\\javascript\\wallet",
     "userName": "user1",
     "connectionProfilePath": "C:\\Users\\falazigb\\Documents\\GitHub\\fabric\\fabric-samples\\first-network\\connection-org1.json"
   }