Genesis test fixes

Author: mikera

convex-core/src/main/java/convex/core/init/Init.java

@@ -71,7 +71,7 @@ public class Init {
 	/**
 	 * Number of coins issued at genesis (one million)
 	 */
-	private static final long GENESIS_COINS=1000000*Coin.GOLD;
+	public static final long GENESIS_COINS=1000000*Coin.GOLD;
 
 	public static final AccountKey DEFAULT_GOV_KEY = AccountKey.fromHex("12EF73ee900eD1FE78A188f59bF8CedE467bAA66f5b60368aFAaA3B9521aB94d");
 	public static final AccountKey DEFAULT_GENESIS_KEY = AccountKey.fromHex("c1d3b0104d55ddf7680181a46e93422e49e2ea9298e37794860f1ef1128427f7");

convex-core/src/test/java/convex/core/init/GenesisTest.java

@@ -12,13 +12,16 @@
 public class GenesisTest {
 
 	@Test
-	public static void testGenesis() {
+	public void testGenesis() {
 		State genesis=Init.createState(Init.DEFAULT_GOV_KEY, Init.DEFAULT_GENESIS_KEY, List.of(Init.FIRST_PEER_KEY));
-		assertEquals("b0e44f2a645abfa539f5b96b7a0eabb0f902866feaff0f7c12d1213e02333f13",genesis.getHash().toHexString());
+		// This changes because of updates to cvx files
+		// assertEquals("b0e44f2a645abfa539f5b96b7a0eabb0f902866feaff0f7c12d1213e02333f13",genesis.getHash().toHexString());
+		assertEquals("15dce0fe6903633b4ed01aa4452d7250901d5a29cbf7f2c5916c97535ee948da",genesis.getHash().toHexString());
 
 		assertEquals(Init.FIRST_USER_KEY,genesis.getAccount(13).getAccountKey());
 
-		assertEquals(Coin.MAX_SUPPLY,genesis.computeSupply());
+		assertEquals(Init.GENESIS_COINS,genesis.computeSupply()); // 1m CVM initially in genesis
+		assertEquals(Coin.MAX_SUPPLY,genesis.computeTotalBalance());
 
 		// Should be 128 reserved addresses plus two currencies and markets (USDF and GBPF)
 		assertEquals(132,genesis.getAccounts().count());