Skip to content

Commit

Permalink
Refactor transactions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikera
mikera committed Oct 14, 2024
1 parent c67e1d8 commit ac45b34
Show file tree
Hide file tree
Showing 23 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
import convex.core.cpos.Block;
import convex.core.cpos.BlockResult;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Transfer;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.AccountStatus;
import convex.core.data.Address;
import convex.core.data.Cells;
import convex.core.data.SignedData;
import convex.core.exceptions.BadSignatureException;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Transfer;

public class BigBlockBenchmark {

Expand Down
8 changes: 4 additions & 4 deletions convex-benchmarks/src/main/java/convex/benchmarks/CVMBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

import convex.core.ResultContext;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Call;
import convex.core.cvm.transactions.Invoke;
import convex.core.cvm.transactions.Transfer;
import convex.core.data.ACell;
import convex.core.data.Address;
import convex.core.data.Keywords;
Expand All @@ -19,10 +23,6 @@
import convex.core.lang.Symbols;
import convex.core.lang.ops.Constant;
import convex.core.lang.ops.Lookup;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Call;
import convex.core.transactions.Invoke;
import convex.core.transactions.Transfer;


/**
Expand Down
2 changes: 1 addition & 1 deletion convex-benchmarks/src/main/java/convex/benchmarks/LatencyBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import convex.core.Coin;
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.Address;
import convex.core.lang.ops.Constant;
import convex.core.transactions.Invoke;
import convex.peer.API;
import convex.peer.Server;

Expand Down
2 changes: 1 addition & 1 deletion convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import convex.api.ConvexLocal;
import convex.core.Result;
import convex.core.cvm.State;
import convex.core.cvm.transactions.Invoke;
import convex.core.crypto.AKeyPair;
import convex.core.data.ACell;
import convex.core.data.AccountKey;
Expand All @@ -22,7 +23,6 @@
import convex.core.init.Init;
import convex.core.lang.Reader;
import convex.core.lang.ops.Constant;
import convex.core.transactions.Invoke;
import convex.peer.API;
import convex.peer.Server;

Expand Down
4 changes: 2 additions & 2 deletions convex-cli/src/main/java/convex/cli/client/Transact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import convex.cli.CLIError;
import convex.cli.ExitCodes;
import convex.core.Result;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.ACell;
import convex.core.data.Address;
import convex.core.data.Format;
import convex.core.lang.Reader;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.core.util.FileUtils;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
Expand Down
4 changes: 2 additions & 2 deletions convex-cli/src/main/java/convex/cli/peer/PeerCreate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.crypto.PFXTools;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.ACell;
import convex.core.data.Address;
import convex.core.exceptions.ResultException;
import convex.core.lang.Reader;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Model.CommandSpec;
Expand Down
4 changes: 2 additions & 2 deletions convex-gui/src/main/java/convex/gui/actor/SmartOpComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import convex.core.data.AList;
import convex.core.data.AVector;
import convex.core.cvm.AccountStatus;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.Address;
import convex.core.data.Lists;
import convex.core.data.Symbol;
Expand All @@ -27,8 +29,6 @@
import convex.core.lang.Reader;
import convex.core.lang.Symbols;
import convex.core.lang.impl.Fn;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.gui.components.BaseListComponent;
import convex.gui.components.CodeLabel;
import convex.gui.components.Toast;
Expand Down
2 changes: 1 addition & 1 deletion convex-gui/src/main/java/convex/gui/panels/REPLPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import convex.api.ConvexRemote;
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.ACell;
import convex.core.data.AList;
import convex.core.data.AString;
Expand All @@ -41,7 +42,6 @@
import convex.core.lang.RT;
import convex.core.lang.Reader;
import convex.core.lang.Symbols;
import convex.core.transactions.ATransaction;
import convex.core.util.Utils;
import convex.gui.components.ActionButton;
import convex.gui.components.ActionPanel;
Expand Down
8 changes: 4 additions & 4 deletions convex-gui/src/main/java/convex/gui/server/StressPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
import convex.api.Convex;
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.cvm.transactions.Multi;
import convex.core.cvm.transactions.Transfer;
import convex.core.data.ACell;
import convex.core.data.AVector;
import convex.core.data.Address;
import convex.core.data.Strings;
import convex.core.lang.Reader;
import convex.core.text.Text;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.core.transactions.Multi;
import convex.core.transactions.Transfer;
import convex.core.util.ThreadUtils;
import convex.core.util.Utils;
import convex.gui.components.ActionPanel;
Expand Down
2 changes: 1 addition & 1 deletion convex-java/src/main/java/convex/java/ConvexHTTP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import convex.core.Result;
import convex.core.SourceCodes;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.ACell;
import convex.core.data.AMap;
import convex.core.data.Address;
Expand All @@ -30,7 +31,6 @@
import convex.core.lang.RT;
import convex.core.lang.Reader;
import convex.core.store.AStore;
import convex.core.transactions.ATransaction;
import convex.core.util.Utils;
import convex.net.Message;

Expand Down
2 changes: 1 addition & 1 deletion convex-observer/src/main/java/convex/observer/LogObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.slf4j.LoggerFactory;

import convex.core.Result;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.SignedData;
import convex.core.transactions.ATransaction;
import convex.peer.Server;

public class LogObserver {
Expand Down
2 changes: 1 addition & 1 deletion convex-observer/src/main/java/convex/observer/StrimziKafka.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import org.json.simple.JSONValue;

import convex.core.cpos.Order;
import convex.core.cvm.transactions.ATransaction;
import convex.core.Result;
import convex.core.data.SignedData;
import convex.core.lang.RT;
import convex.core.transactions.ATransaction;
import convex.core.util.Shutdown;
import convex.core.util.Utils;
import convex.peer.Server;
Expand Down
6 changes: 3 additions & 3 deletions convex-peer/src/main/java/convex/api/Convex.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import convex.core.crypto.AKeyPair;
import convex.core.cvm.AccountStatus;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.cvm.transactions.Transfer;
import convex.core.data.ABlob;
import convex.core.data.ACell;
import convex.core.data.AList;
Expand All @@ -40,9 +43,6 @@
import convex.core.lang.ops.Special;
import convex.core.store.AStore;
import convex.core.store.Stores;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.core.transactions.Transfer;
import convex.core.util.Utils;
import convex.net.IPUtils;
import convex.net.Message;
Expand Down
2 changes: 1 addition & 1 deletion convex-peer/src/main/java/convex/api/ConvexLocal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import convex.core.crypto.AKeyPair;
import convex.core.cvm.AccountStatus;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.ACell;
import convex.core.data.Address;
import convex.core.data.Blob;
Expand All @@ -22,7 +23,6 @@
import convex.core.data.prim.CVMLong;
import convex.core.exceptions.MissingDataException;
import convex.core.store.AStore;
import convex.core.transactions.ATransaction;
import convex.core.util.ThreadUtils;
import convex.net.Message;
import convex.net.MessageType;
Expand Down
2 changes: 1 addition & 1 deletion convex-peer/src/main/java/convex/api/ConvexRemote.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import convex.core.SourceCodes;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.ACell;
import convex.core.data.Address;
import convex.core.data.Blob;
Expand All @@ -25,7 +26,6 @@
import convex.core.lang.RT;
import convex.core.store.AStore;
import convex.core.store.Stores;
import convex.core.transactions.ATransaction;
import convex.net.Connection;
import convex.net.Message;
import convex.peer.Server;
Expand Down
2 changes: 1 addition & 1 deletion convex-peer/src/main/java/convex/net/Connection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import convex.core.Constants;
import convex.core.Result;
import convex.core.cvm.transactions.ATransaction;
import convex.core.data.ACell;
import convex.core.data.AccountKey;
import convex.core.data.AVector;
Expand All @@ -38,7 +39,6 @@
import convex.core.exceptions.BadFormatException;
import convex.core.store.AStore;
import convex.core.store.Stores;
import convex.core.transactions.ATransaction;
import convex.core.util.Counters;
import convex.core.util.Utils;
import convex.core.util.Shutdown;
Expand Down
4 changes: 2 additions & 2 deletions convex-peer/src/main/java/convex/peer/TransactionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import convex.core.cvm.Peer;
import convex.core.cvm.PeerStatus;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.ACell;
import convex.core.data.AString;
import convex.core.data.AVector;
Expand All @@ -40,8 +42,6 @@
import convex.core.exceptions.MissingDataException;
import convex.core.lang.RT;
import convex.core.lang.Reader;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.core.util.LoadMonitor;
import convex.core.util.Utils;
import convex.net.Message;
Expand Down
4 changes: 2 additions & 2 deletions convex-peer/src/test/java/convex/api/ConvexLocalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.crypto.Ed25519Signature;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.ABlob;
import convex.core.data.ACell;
import convex.core.data.Address;
Expand All @@ -27,8 +29,6 @@
import convex.core.exceptions.ResultException;
import convex.core.lang.Reader;
import convex.core.lang.ops.Constant;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.net.Message;
import convex.peer.TestNetwork;

Expand Down
4 changes: 2 additions & 2 deletions convex-peer/src/test/java/convex/api/ConvexRemoteTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import convex.core.SourceCodes;
import convex.core.crypto.AKeyPair;
import convex.core.crypto.Ed25519Signature;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.Address;
import convex.core.data.Blobs;
import convex.core.data.Ref;
Expand All @@ -30,8 +32,6 @@
import convex.core.lang.RT;
import convex.core.lang.Reader;
import convex.core.lang.ops.Constant;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.net.Connection;
import convex.net.Message;
import convex.net.MessageType;
Expand Down
2 changes: 1 addition & 1 deletion convex-peer/src/test/java/convex/peer/JoinNetworkTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
import convex.core.Result;
import convex.core.cpos.CPoSConstants;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.AccountKey;
import convex.core.data.Address;
import convex.core.data.Keyword;
import convex.core.data.Keywords;
import convex.core.exceptions.BadSignatureException;
import convex.core.exceptions.ResultException;
import convex.core.lang.RT;
import convex.core.transactions.Invoke;
import convex.etch.EtchStore;

public class JoinNetworkTest {
Expand Down
2 changes: 1 addition & 1 deletion convex-peer/src/test/java/convex/peer/RestoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import convex.core.Result;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.State;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.AccountKey;
import convex.core.data.Address;
import convex.core.data.Keyword;
Expand All @@ -28,7 +29,6 @@
import convex.core.init.Init;
import convex.core.lang.Symbols;
import convex.core.store.AStore;
import convex.core.transactions.Invoke;
import convex.etch.Etch;
import convex.etch.EtchStore;
import convex.etch.EtchUtils;
Expand Down
4 changes: 2 additions & 2 deletions convex-peer/src/test/java/convex/peer/ServerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import convex.core.cpos.Belief;
import convex.core.crypto.AKeyPair;
import convex.core.cvm.State;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.ACell;
import convex.core.data.AVector;
import convex.core.data.Address;
Expand All @@ -41,8 +43,6 @@
import convex.core.lang.Symbols;
import convex.core.store.AStore;
import convex.core.store.Stores;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.net.Connection;

/**
Expand Down
4 changes: 2 additions & 2 deletions convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import convex.core.data.Keywords;
import convex.core.data.Lists;
import convex.core.cvm.PeerStatus;
import convex.core.cvm.transactions.ATransaction;
import convex.core.cvm.transactions.Invoke;
import convex.core.data.Ref;
import convex.core.data.SignedData;
import convex.core.data.Strings;
Expand All @@ -44,8 +46,6 @@
import convex.core.lang.RT;
import convex.core.lang.Reader;
import convex.core.lang.Symbols;
import convex.core.transactions.ATransaction;
import convex.core.transactions.Invoke;
import convex.core.util.Utils;
import convex.java.JSON;
import convex.restapi.RESTServer;
Expand Down

0 comments on commit ac45b34

Please sign in to comment.