Moved the io-hotmoka-beans-api module into io-hotmoka-node-api

Hotmoka · Apr 19, 2024 · 3074394 · 3074394
1 parent 505d9f7
commit 3074394
Show file tree

Hide file tree

Showing 558 changed files with 1,591 additions and 1,694 deletions.
diff --git a/io-hotmoka-beans-api/pom.xml b/io-hotmoka-beans-api/pom.xml
diff --git a/io-hotmoka-beans-api/src/main/java/module-info.java b/io-hotmoka-beans-api/src/main/java/module-info.java
diff --git a/io-hotmoka-helpers-api/pom.xml b/io-hotmoka-helpers-api/pom.xml
@@ -21,9 +21,9 @@
       <version>${io.hotmoka.annotations.version}</version>
     </dependency>
     <dependency>
-  	  <groupId>io.hotmoka</groupId>
-  	  <artifactId>io-hotmoka-beans-api</artifactId>
-  	  <version>${hotmoka.version}</version>
+  	  <groupId>io.hotmoka.crypto</groupId>
+  	  <artifactId>io-hotmoka-crypto-api</artifactId>
+  	  <version>${io.hotmoka.crypto.version}</version>
     </dependency>
     <dependency>
   	  <groupId>io.hotmoka</groupId>

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/AccountCreationHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/AccountCreationHelper.java
@@ -27,14 +27,14 @@
 import java.util.function.Consumer;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.requests.TransactionRequest;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.crypto.api.SignatureAlgorithm;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.requests.TransactionRequest;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * An object that helps with the creation of new accounts.

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/AccountsNode.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/AccountsNode.java
@@ -22,9 +22,9 @@
 import java.util.stream.Stream;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.node.api.Node;
 import io.hotmoka.node.api.NodeException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * A node that provides access to a previously installed set of accounts.

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/ClassLoaderHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/ClassLoaderHelper.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.transactions.TransactionReference;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.transactions.TransactionReference;
 import io.hotmoka.verification.api.TakamakaClassLoader;
 
 /**

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/InitializedNode.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/InitializedNode.java
@@ -19,9 +19,9 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.node.api.Node;
 import io.hotmoka.node.api.NodeException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * A node where the jar with the basic Takamaka classes have been installed,

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/JarsNode.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/JarsNode.java
@@ -20,9 +20,9 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.transactions.TransactionReference;
 import io.hotmoka.node.api.Node;
 import io.hotmoka.node.api.NodeException;
+import io.hotmoka.node.api.transactions.TransactionReference;
 
 /**
  * A node that provides access to a set of previously installed jars,

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/ManifestHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/ManifestHelper.java
@@ -18,12 +18,12 @@
 
 import java.util.concurrent.TimeoutException;
 
-import io.hotmoka.beans.api.transactions.TransactionReference;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
+import io.hotmoka.node.api.transactions.TransactionReference;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * An object that helps with the access to the manifest of a node.

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/MintBurnHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/MintBurnHelper.java
@@ -21,11 +21,11 @@
 import java.security.KeyPair;
 import java.security.SignatureException;
 
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.crypto.api.SignatureAlgorithm;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * A helper for minting and burning coins of an account in the accounts ledger

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/NonceHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/NonceHelper.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * An object that helps with nonce operations.

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/SendCoinsHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/SendCoinsHelper.java
@@ -25,13 +25,13 @@
 import java.util.function.Consumer;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.requests.TransactionRequest;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.requests.TransactionRequest;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * An object that helps with sending coins to accounts.

diff --git a/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/SignatureHelper.java b/io-hotmoka-helpers-api/src/main/java/io/hotmoka/helpers/api/SignatureHelper.java
@@ -20,13 +20,13 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.crypto.api.SignatureAlgorithm;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * A helper to determine the signature algorithm to use for an externally owned account.

diff --git a/io-hotmoka-helpers-api/src/main/java/module-info.java b/io-hotmoka-helpers-api/src/main/java/module-info.java
@@ -23,7 +23,6 @@
 
 	requires io.hotmoka.annotations;
 	requires transitive io.hotmoka.crypto.api;
-	requires transitive io.hotmoka.beans.api;
+	requires transitive io.hotmoka.node.api;
 	requires transitive io.hotmoka.verification.api;
-	requires io.hotmoka.node.api;
 }
diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/AccountsNodes.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/AccountsNodes.java
@@ -25,8 +25,6 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.transactions.TransactionReference;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.helpers.api.AccountsNode;
 import io.hotmoka.helpers.internal.AccountsNodeImpl;
 import io.hotmoka.node.api.CodeExecutionException;
@@ -35,6 +33,8 @@
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.transactions.TransactionReference;
+import io.hotmoka.node.api.values.StorageReference;
 import io.takamaka.code.constants.Constants;
 
 /**

diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/GasCounters.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/GasCounters.java
@@ -17,10 +17,10 @@
 package io.hotmoka.helpers;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.requests.TransactionRequest;
 import io.hotmoka.helpers.api.GasCounter;
 import io.hotmoka.helpers.internal.GasCounterImpl;
 import io.hotmoka.node.api.Node;
+import io.hotmoka.node.api.requests.TransactionRequest;
 
 /**
  * Providers of counters of the gas consumed for the execution of a set of requests.

diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/InitializedNodes.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/InitializedNodes.java
@@ -24,17 +24,17 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.nodes.ConsensusConfig;
-import io.hotmoka.beans.api.nodes.ValidatorsConsensusConfig;
-import io.hotmoka.beans.api.transactions.TransactionReference;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.helpers.api.InitializedNode;
 import io.hotmoka.helpers.internal.InitializedNodeImpl;
 import io.hotmoka.node.api.CodeExecutionException;
 import io.hotmoka.node.api.Node;
 import io.hotmoka.node.api.NodeException;
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
+import io.hotmoka.node.api.nodes.ConsensusConfig;
+import io.hotmoka.node.api.nodes.ValidatorsConsensusConfig;
+import io.hotmoka.node.api.transactions.TransactionReference;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * Providers of nodes where the jar with the basic Takamaka classes have been installed,

diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/JarsNodes.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/JarsNodes.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.TimeoutException;
 
 import io.hotmoka.annotations.ThreadSafe;
-import io.hotmoka.beans.api.values.StorageReference;
 import io.hotmoka.helpers.api.JarsNode;
 import io.hotmoka.helpers.internal.JarsNodeImpl;
 import io.hotmoka.node.api.CodeExecutionException;
@@ -34,6 +33,7 @@
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.values.StorageReference;
 
 /**
  * Providers of nodes that provide access to a set of previously installed jars,

diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/internal/AccountCreationHelperImpl.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/internal/AccountCreationHelperImpl.java
@@ -26,14 +26,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import io.hotmoka.beans.api.requests.ConstructorCallTransactionRequest;
-import io.hotmoka.beans.api.requests.InstanceMethodCallTransactionRequest;
-import io.hotmoka.beans.api.requests.SignedTransactionRequest;
-import io.hotmoka.beans.api.requests.TransactionRequest;
-import io.hotmoka.beans.api.transactions.TransactionReference;
-import io.hotmoka.beans.api.types.ClassType;
-import io.hotmoka.beans.api.values.StorageReference;
-import io.hotmoka.beans.api.values.StringValue;
 import io.hotmoka.crypto.Base64;
 import io.hotmoka.crypto.SignatureAlgorithms;
 import io.hotmoka.crypto.api.SignatureAlgorithm;
@@ -55,6 +47,14 @@
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.requests.ConstructorCallTransactionRequest;
+import io.hotmoka.node.api.requests.InstanceMethodCallTransactionRequest;
+import io.hotmoka.node.api.requests.SignedTransactionRequest;
+import io.hotmoka.node.api.requests.TransactionRequest;
+import io.hotmoka.node.api.transactions.TransactionReference;
+import io.hotmoka.node.api.types.ClassType;
+import io.hotmoka.node.api.values.StorageReference;
+import io.hotmoka.node.api.values.StringValue;
 
 /**
  * An object that helps with the creation of new accounts.

diff --git a/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/internal/AccountsNodeImpl.java b/io-hotmoka-helpers/src/main/java/io/hotmoka/helpers/internal/AccountsNodeImpl.java
@@ -31,25 +31,6 @@
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
-import io.hotmoka.beans.api.nodes.ConsensusConfig;
-import io.hotmoka.beans.api.nodes.NodeInfo;
-import io.hotmoka.beans.api.requests.ConstructorCallTransactionRequest;
-import io.hotmoka.beans.api.requests.GameteCreationTransactionRequest;
-import io.hotmoka.beans.api.requests.InitializationTransactionRequest;
-import io.hotmoka.beans.api.requests.InstanceMethodCallTransactionRequest;
-import io.hotmoka.beans.api.requests.JarStoreInitialTransactionRequest;
-import io.hotmoka.beans.api.requests.JarStoreTransactionRequest;
-import io.hotmoka.beans.api.requests.SignedTransactionRequest;
-import io.hotmoka.beans.api.requests.StaticMethodCallTransactionRequest;
-import io.hotmoka.beans.api.requests.TransactionRequest;
-import io.hotmoka.beans.api.responses.TransactionResponse;
-import io.hotmoka.beans.api.transactions.TransactionReference;
-import io.hotmoka.beans.api.updates.ClassTag;
-import io.hotmoka.beans.api.updates.Update;
-import io.hotmoka.beans.api.values.BigIntegerValue;
-import io.hotmoka.beans.api.values.StorageReference;
-import io.hotmoka.beans.api.values.StorageValue;
-import io.hotmoka.beans.api.values.StringValue;
 import io.hotmoka.closeables.api.OnCloseHandler;
 import io.hotmoka.crypto.Base64;
 import io.hotmoka.crypto.api.Signer;
@@ -71,6 +52,25 @@
 import io.hotmoka.node.api.TransactionException;
 import io.hotmoka.node.api.TransactionRejectedException;
 import io.hotmoka.node.api.UnknownReferenceException;
+import io.hotmoka.node.api.nodes.ConsensusConfig;
+import io.hotmoka.node.api.nodes.NodeInfo;
+import io.hotmoka.node.api.requests.ConstructorCallTransactionRequest;
+import io.hotmoka.node.api.requests.GameteCreationTransactionRequest;
+import io.hotmoka.node.api.requests.InitializationTransactionRequest;
+import io.hotmoka.node.api.requests.InstanceMethodCallTransactionRequest;
+import io.hotmoka.node.api.requests.JarStoreInitialTransactionRequest;
+import io.hotmoka.node.api.requests.JarStoreTransactionRequest;
+import io.hotmoka.node.api.requests.SignedTransactionRequest;
+import io.hotmoka.node.api.requests.StaticMethodCallTransactionRequest;
+import io.hotmoka.node.api.requests.TransactionRequest;
+import io.hotmoka.node.api.responses.TransactionResponse;
+import io.hotmoka.node.api.transactions.TransactionReference;
+import io.hotmoka.node.api.updates.ClassTag;
+import io.hotmoka.node.api.updates.Update;
+import io.hotmoka.node.api.values.BigIntegerValue;
+import io.hotmoka.node.api.values.StorageReference;
+import io.hotmoka.node.api.values.StorageValue;
+import io.hotmoka.node.api.values.StringValue;
 
 /**
  * A decorator of a node, that creates some initial accounts in it.