Merge pull request #1352 from kaleido-io/erc1155-test

Add E2E test for indexing an existing ERC1155

Author: awrichar

manifest.json

@@ -21,8 +21,8 @@
   },
   "tokens-erc1155": {
     "image": "ghcr.io/hyperledger/firefly-tokens-erc1155",
-    "tag": "v1.2.4",
-    "sha": "cd65eab2e5836b52dfed29a517049e21e2bacd534203b191cee7df42544847f7"
+    "tag": "v1.2.4-20230628-68",
+    "sha": "05b1a7d0506316c736cdbe583445ea41f93b6cad246619eb9ea41bd99516b7a7"
   },
   "tokens-erc20-erc721": {
     "image": "ghcr.io/hyperledger/firefly-tokens-erc20-erc721",

test/e2e/multiparty/ethereum_token_contract.go

@@ -379,15 +379,17 @@ var expectedERC1155Methods = fftypes.JSONAnyPtr(`{
 type EthereumTokenContractTestSuite struct {
 	suite.Suite
 	testState       *testState
+	connector       string
 	contract        string
 	expectedMethods *fftypes.JSONAny
 }
 
 func (suite *EthereumTokenContractTestSuite) SetupSuite() {
 	stack := e2e.ReadStack(suite.T())
+	suite.connector = stack.TokenProviders[0]
 	suite.contract = "erc20/ERC20OpenZeppelin.json"
 	suite.expectedMethods = expectedERC20Methods
-	if stack.TokenProviders[0] == "erc1155" {
+	if suite.connector == "erc1155" {
 		suite.contract = "erc1155/ERC1155Sample.json"
 		suite.expectedMethods = expectedERC1155Methods
 	}
@@ -413,7 +415,7 @@ func (suite *EthereumTokenContractTestSuite) TestTokensWithInterface() {
 	version := contractVersion()
 
 	ffi := suite.testState.client1.GenerateFFIFromABI(suite.T(), &fftypes.FFIGenerationRequest{
-		Name:    "ERC20",
+		Name:    "token_contract_test",
 		Version: version,
 		Input:   fftypes.JSONAnyPtr(`{"abi":` + contractJSON.GetObjectArray("abi").String() + `}`),
 	})
@@ -428,7 +430,7 @@ func (suite *EthereumTokenContractTestSuite) TestTokensWithInterface() {
 			"address": contractAddress,
 		},
 		Interface: &fftypes.FFIReference{
-			Name:    "ERC20",
+			Name:    "token_contract_test",
 			Version: version,
 		},
 	}
@@ -468,4 +470,13 @@ func (suite *EthereumTokenContractTestSuite) TestTokensWithInterface() {
 	e2e.ValidateAccountBalances(suite.T(), suite.testState.client1, poolResp.ID, "", map[string]int64{
 		suite.testState.org1key.Value: 0,
 	})
+
+	if suite.connector == "erc1155" {
+		// Create another pool and pass startId/endId explicitly
+		pool.Name = fmt.Sprintf("pool_%s", e2e.RandomName(suite.T()))
+		pool.Config["startId"] = "0x1" // intentionally does not match a pool generated by the factory
+		pool.Config["endId"] = "0x1"
+		poolResp = suite.testState.client1.CreateTokenPool(suite.T(), pool, true, false)
+		e2e.WaitForEvent(suite.T(), received1, core.EventTypePoolConfirmed, poolResp.ID)
+	}
 }